Merge branch 'master' into blender2.8
This commit is contained in:
commit
028580fd1e
|
|
@ -411,7 +411,7 @@ Object *BlenderSync::sync_object(BL::Depsgraph& b_depsgraph,
|
|||
|
||||
if(scene->need_motion() == Scene::MOTION_BLUR) {
|
||||
motion_steps = object_motion_steps(b_parent, b_ob);
|
||||
if(object_use_deform_motion(b_parent, b_ob)) {
|
||||
if(motion_steps && object_use_deform_motion(b_parent, b_ob)) {
|
||||
mesh->motion_steps = motion_steps;
|
||||
mesh->use_motion_blur = true;
|
||||
}
|
||||
|
|
@ -422,10 +422,13 @@ Object *BlenderSync::sync_object(BL::Depsgraph& b_depsgraph,
|
|||
}
|
||||
|
||||
object->motion.resize(motion_steps, transform_empty());
|
||||
object->motion[motion_steps/2] = tfm;
|
||||
|
||||
for(size_t step = 0; step < motion_steps; step++) {
|
||||
motion_times.insert(object->motion_time(step));
|
||||
if(motion_steps) {
|
||||
object->motion[motion_steps/2] = tfm;
|
||||
|
||||
for(size_t step = 0; step < motion_steps; step++) {
|
||||
motion_times.insert(object->motion_time(step));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -5785,6 +5785,15 @@ DisplacementNode::DisplacementNode()
|
|||
{
|
||||
}
|
||||
|
||||
void DisplacementNode::constant_fold(const ConstantFolder& folder)
|
||||
{
|
||||
if(folder.all_inputs_constant()) {
|
||||
if((height - midlevel == 0.0f) || (scale == 0.0f)) {
|
||||
folder.make_zero();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void DisplacementNode::compile(SVMCompiler& compiler)
|
||||
{
|
||||
ShaderInput *height_in = input("Height");
|
||||
|
|
@ -5836,6 +5845,16 @@ VectorDisplacementNode::VectorDisplacementNode()
|
|||
{
|
||||
}
|
||||
|
||||
void VectorDisplacementNode::constant_fold(const ConstantFolder& folder)
|
||||
{
|
||||
if(folder.all_inputs_constant()) {
|
||||
if((vector == make_float3(0.0f, 0.0f, 0.0f) && midlevel == 0.0f) ||
|
||||
(scale == 0.0f)) {
|
||||
folder.make_zero();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void VectorDisplacementNode::attributes(Shader *shader, AttributeRequestSet *attributes)
|
||||
{
|
||||
if(shader->has_surface && space == NODE_NORMAL_MAP_TANGENT) {
|
||||
|
|
|
|||
|
|
@ -1063,6 +1063,7 @@ public:
|
|||
class DisplacementNode : public ShaderNode {
|
||||
public:
|
||||
SHADER_NODE_CLASS(DisplacementNode)
|
||||
void constant_fold(const ConstantFolder& folder);
|
||||
virtual int get_feature() {
|
||||
return NODE_FEATURE_BUMP;
|
||||
}
|
||||
|
|
@ -1079,6 +1080,7 @@ public:
|
|||
SHADER_NODE_CLASS(VectorDisplacementNode)
|
||||
void attributes(Shader *shader, AttributeRequestSet *attributes);
|
||||
bool has_attribute_dependency() { return true; }
|
||||
void constant_fold(const ConstantFolder& folder);
|
||||
virtual int get_feature() {
|
||||
return NODE_FEATURE_BUMP;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -146,13 +146,19 @@ bool BKE_object_pose_context_check(struct Object *ob);
|
|||
struct Object *BKE_object_pose_armature_get(struct Object *ob);
|
||||
struct Object *BKE_object_pose_armature_get_visible(struct Object *ob, struct ViewLayer *view_layer);
|
||||
|
||||
void BKE_object_get_parent_matrix(struct Scene *scene, struct Object *ob,
|
||||
struct Object *par, float parentmat[4][4]);
|
||||
void BKE_object_where_is_calc(const struct EvaluationContext *eval_ctx, struct Scene *scene, struct Object *ob);
|
||||
void BKE_object_where_is_calc_ex(const struct EvaluationContext *eval_ctx, struct Scene *scene, struct RigidBodyWorld *rbw, struct Object *ob, float r_originmat[3][3]);
|
||||
void BKE_object_where_is_calc_time(const struct EvaluationContext *eval_ctx, struct Scene *scene, struct Object *ob, float ctime);
|
||||
void BKE_object_where_is_calc_time_ex(const struct EvaluationContext *eval_ctx, struct Scene *scene, struct Object *ob, float ctime,
|
||||
struct RigidBodyWorld *rbw, float r_originmat[3][3]);
|
||||
void BKE_object_get_parent_matrix(
|
||||
struct Scene *scene, struct Object *ob,
|
||||
struct Object *par, float parentmat[4][4]);
|
||||
void BKE_object_where_is_calc(
|
||||
const struct EvaluationContext *eval_ctx, struct Scene *scene, struct Object *ob);
|
||||
void BKE_object_where_is_calc_ex(
|
||||
const struct EvaluationContext *eval_ctx, struct Scene *scene, struct RigidBodyWorld *rbw,
|
||||
struct Object *ob, float r_originmat[3][3]);
|
||||
void BKE_object_where_is_calc_time(
|
||||
const struct EvaluationContext *eval_ctx, struct Scene *scene, struct Object *ob, float ctime);
|
||||
void BKE_object_where_is_calc_time_ex(
|
||||
const struct EvaluationContext *eval_ctx, struct Scene *scene, struct Object *ob, float ctime,
|
||||
struct RigidBodyWorld *rbw, float r_originmat[3][3]);
|
||||
void BKE_object_where_is_calc_mat4(struct Scene *scene, struct Object *ob, float obmat[4][4]);
|
||||
|
||||
/* possibly belong in own moduke? */
|
||||
|
|
@ -168,14 +174,17 @@ void BKE_object_dimensions_set(struct Object *ob, const float value[3]);
|
|||
void BKE_object_empty_draw_type_set(struct Object *ob, const int value);
|
||||
void BKE_object_boundbox_flag(struct Object *ob, int flag, const bool set);
|
||||
void BKE_object_minmax(struct Object *ob, float r_min[3], float r_max[3], const bool use_hidden);
|
||||
bool BKE_object_minmax_dupli(struct Scene *scene, struct Object *ob, float r_min[3], float r_max[3], const bool use_hidden);
|
||||
bool BKE_object_minmax_dupli(
|
||||
struct Scene *scene, struct Object *ob, float r_min[3], float r_max[3], const bool use_hidden);
|
||||
|
||||
/* sometimes min-max isn't enough, we need to loop over each point */
|
||||
void BKE_object_foreach_display_point(struct Object *ob, float obmat[4][4],
|
||||
void (*func_cb)(const float[3], void *), void *user_data);
|
||||
void BKE_scene_foreach_display_point(struct Scene *scene,
|
||||
struct ViewLayer *view_layer,
|
||||
void (*func_cb)(const float[3], void *), void *user_data);
|
||||
void BKE_object_foreach_display_point(
|
||||
struct Object *ob, float obmat[4][4],
|
||||
void (*func_cb)(const float[3], void *), void *user_data);
|
||||
void BKE_scene_foreach_display_point(
|
||||
struct Scene *scene,
|
||||
struct ViewLayer *view_layer,
|
||||
void (*func_cb)(const float[3], void *), void *user_data);
|
||||
|
||||
bool BKE_object_parent_loop_check(const struct Object *parent, const struct Object *ob);
|
||||
|
||||
|
|
@ -191,48 +200,61 @@ typedef struct ObjectTfmProtectedChannels {
|
|||
float rotAngle, drotAngle;
|
||||
} ObjectTfmProtectedChannels;
|
||||
|
||||
void BKE_object_tfm_protected_backup(const struct Object *ob,
|
||||
ObjectTfmProtectedChannels *obtfm);
|
||||
void BKE_object_tfm_protected_backup(
|
||||
const struct Object *ob,
|
||||
ObjectTfmProtectedChannels *obtfm);
|
||||
|
||||
void BKE_object_tfm_protected_restore(struct Object *ob,
|
||||
const ObjectTfmProtectedChannels *obtfm,
|
||||
const short protectflag);
|
||||
void BKE_object_tfm_protected_restore(
|
||||
struct Object *ob,
|
||||
const ObjectTfmProtectedChannels *obtfm,
|
||||
const short protectflag);
|
||||
|
||||
/* Dependency graph evaluation callbacks. */
|
||||
void BKE_object_eval_local_transform(const struct EvaluationContext *eval_ctx,
|
||||
struct Object *ob);
|
||||
void BKE_object_eval_parent(const struct EvaluationContext *eval_ctx,
|
||||
struct Scene *scene,
|
||||
struct Object *ob);
|
||||
void BKE_object_eval_constraints(const struct EvaluationContext *eval_ctx,
|
||||
struct Scene *scene,
|
||||
struct Object *ob);
|
||||
void BKE_object_eval_local_transform(
|
||||
const struct EvaluationContext *eval_ctx,
|
||||
struct Object *ob);
|
||||
void BKE_object_eval_parent(
|
||||
const struct EvaluationContext *eval_ctx,
|
||||
struct Scene *scene,
|
||||
struct Object *ob);
|
||||
void BKE_object_eval_constraints(
|
||||
const struct EvaluationContext *eval_ctx,
|
||||
struct Scene *scene,
|
||||
struct Object *ob);
|
||||
void BKE_object_eval_done(const struct EvaluationContext *eval_ctx, struct Object *ob);
|
||||
|
||||
bool BKE_object_eval_proxy_copy(const struct EvaluationContext *eval_ct,
|
||||
struct Object *object);
|
||||
void BKE_object_eval_uber_transform(const struct EvaluationContext *eval_ctx,
|
||||
struct Object *ob);
|
||||
void BKE_object_eval_uber_data(const struct EvaluationContext *eval_ctx,
|
||||
struct Scene *scene,
|
||||
struct Object *ob);
|
||||
bool BKE_object_eval_proxy_copy(
|
||||
const struct EvaluationContext *eval_ctx,
|
||||
struct Object *object);
|
||||
void BKE_object_eval_uber_transform(
|
||||
const struct EvaluationContext *eval_ctx,
|
||||
struct Object *ob);
|
||||
void BKE_object_eval_uber_data(
|
||||
const struct EvaluationContext *eval_ctx,
|
||||
struct Scene *scene,
|
||||
struct Object *ob);
|
||||
|
||||
void BKE_object_eval_cloth(const struct EvaluationContext *eval_ctx,
|
||||
struct Scene *scene,
|
||||
struct Object *object);
|
||||
void BKE_object_eval_cloth(
|
||||
const struct EvaluationContext *eval_ctx,
|
||||
struct Scene *scene,
|
||||
struct Object *object);
|
||||
|
||||
void BKE_object_eval_transform_all(const struct EvaluationContext *eval_ctx,
|
||||
struct Scene *scene,
|
||||
struct Object *object);
|
||||
void BKE_object_eval_transform_all(
|
||||
const struct EvaluationContext *eval_ctx,
|
||||
struct Scene *scene,
|
||||
struct Object *object);
|
||||
|
||||
void BKE_object_eval_update_shading(const struct EvaluationContext *eval_ctx,
|
||||
struct Object *object);
|
||||
void BKE_object_data_select_update(const struct EvaluationContext *eval_ctx,
|
||||
struct ID *object_data);
|
||||
void BKE_object_eval_update_shading(
|
||||
const struct EvaluationContext *eval_ctx,
|
||||
struct Object *object);
|
||||
void BKE_object_data_select_update(
|
||||
const struct EvaluationContext *eval_ctx,
|
||||
struct ID *object_data);
|
||||
|
||||
void BKE_object_eval_flush_base_flags(const struct EvaluationContext *eval_ctx,
|
||||
struct Object *object, struct Base *base,
|
||||
const bool is_from_set);
|
||||
void BKE_object_eval_flush_base_flags(
|
||||
const struct EvaluationContext *eval_ctx,
|
||||
struct Object *object, struct Base *base,
|
||||
const bool is_from_set);
|
||||
|
||||
void BKE_object_handle_data_update(
|
||||
const struct EvaluationContext *eval_ctx,
|
||||
|
|
@ -246,7 +268,6 @@ void BKE_object_handle_update_ex(
|
|||
struct Scene *scene, struct Object *ob,
|
||||
struct RigidBodyWorld *rbw,
|
||||
const bool do_proxy_update);
|
||||
|
||||
void BKE_object_sculpt_modifiers_changed(struct Object *ob);
|
||||
|
||||
int BKE_object_obdata_texspace_get(struct Object *ob, short **r_texflag, float **r_loc, float **r_size, float **r_rot);
|
||||
|
|
@ -289,7 +310,8 @@ typedef enum eObjectSet {
|
|||
OB_SET_ALL /* All Objects */
|
||||
} eObjectSet;
|
||||
|
||||
struct LinkNode *BKE_object_relational_superset(struct ViewLayer *view_layer, eObjectSet objectSet, eObRelationTypes includeFilter);
|
||||
struct LinkNode *BKE_object_relational_superset(
|
||||
struct ViewLayer *view_layer, eObjectSet objectSet, eObRelationTypes includeFilter);
|
||||
struct LinkNode *BKE_object_groups(struct Object *ob);
|
||||
void BKE_object_groups_clear(struct Object *object);
|
||||
|
||||
|
|
@ -297,8 +319,9 @@ struct KDTree *BKE_object_as_kdtree(struct Object *ob, int *r_tot);
|
|||
|
||||
bool BKE_object_modifier_use_time(struct Object *ob, struct ModifierData *md);
|
||||
|
||||
bool BKE_object_modifier_update_subframe(const struct EvaluationContext *eval_ctx, struct Scene *scene, struct Object *ob,
|
||||
bool update_mesh, int parent_recursion, float frame, int type);
|
||||
bool BKE_object_modifier_update_subframe(
|
||||
const struct EvaluationContext *eval_ctx, struct Scene *scene, struct Object *ob,
|
||||
bool update_mesh, int parent_recursion, float frame, int type);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
|
|
|
|||
|
|
@ -50,49 +50,65 @@ struct wmKeyConfig;
|
|||
void ED_operatortypes_uvedit(void);
|
||||
void ED_keymap_uvedit(struct wmKeyConfig *keyconf);
|
||||
|
||||
void ED_uvedit_assign_image(struct Main *bmain, struct Scene *scene, struct Object *obedit, struct Image *ima, struct Image *previma);
|
||||
void ED_uvedit_assign_image(
|
||||
struct Main *bmain, struct Scene *scene, struct Object *obedit, struct Image *ima, struct Image *previma);
|
||||
bool ED_uvedit_minmax(struct Scene *scene, struct Image *ima, struct Object *obedit, float min[2], float max[2]);
|
||||
bool ED_uvedit_center(Scene *scene, Image *ima, struct Object *obedit, float cent[2], char mode);
|
||||
void ED_uvedit_select_all(struct BMesh *bm);
|
||||
|
||||
bool ED_object_get_active_image(struct Object *ob, int mat_nr,
|
||||
struct Image **r_ima, struct ImageUser **r_iuser, struct bNode **r_node, struct bNodeTree **r_ntree);
|
||||
bool ED_object_get_active_image(
|
||||
struct Object *ob, int mat_nr,
|
||||
struct Image **r_ima, struct ImageUser **r_iuser, struct bNode **r_node, struct bNodeTree **r_ntree);
|
||||
void ED_object_assign_active_image(struct Main *bmain, struct Object *ob, int mat_nr, struct Image *ima);
|
||||
|
||||
bool ED_uvedit_test(struct Object *obedit);
|
||||
|
||||
/* visibility and selection */
|
||||
bool uvedit_face_visible_test(struct Scene *scene, struct Object *obedit, struct Image *ima, struct BMFace *efa);
|
||||
bool uvedit_face_select_test(struct Scene *scene, struct BMFace *efa,
|
||||
const int cd_loop_uv_offset);
|
||||
bool uvedit_edge_select_test(struct Scene *scene, struct BMLoop *l,
|
||||
const int cd_loop_uv_offset);
|
||||
bool uvedit_uv_select_test(struct Scene *scene, struct BMLoop *l,
|
||||
const int cd_loop_uv_offset);
|
||||
bool uvedit_face_visible_test(
|
||||
struct Scene *scene, struct Object *obedit, struct Image *ima, struct BMFace *efa);
|
||||
bool uvedit_face_select_test(
|
||||
struct Scene *scene, struct BMFace *efa,
|
||||
const int cd_loop_uv_offset);
|
||||
bool uvedit_edge_select_test(
|
||||
struct Scene *scene, struct BMLoop *l,
|
||||
const int cd_loop_uv_offset);
|
||||
bool uvedit_uv_select_test(
|
||||
struct Scene *scene, struct BMLoop *l,
|
||||
const int cd_loop_uv_offset);
|
||||
/* uv face */
|
||||
bool uvedit_face_select_set(struct Scene *scene, struct BMEditMesh *em, struct BMFace *efa, const bool select,
|
||||
const bool do_history, const int cd_loop_uv_offset);
|
||||
bool uvedit_face_select_enable(struct Scene *scene, struct BMEditMesh *em, struct BMFace *efa,
|
||||
const bool do_history, const int cd_loop_uv_offset);
|
||||
bool uvedit_face_select_disable(struct Scene *scene, struct BMEditMesh *em, struct BMFace *efa,
|
||||
const int cd_loop_uv_offset);
|
||||
bool uvedit_face_select_set(
|
||||
struct Scene *scene, struct BMEditMesh *em, struct BMFace *efa, const bool select,
|
||||
const bool do_history, const int cd_loop_uv_offset);
|
||||
bool uvedit_face_select_enable(
|
||||
struct Scene *scene, struct BMEditMesh *em, struct BMFace *efa,
|
||||
const bool do_history, const int cd_loop_uv_offset);
|
||||
bool uvedit_face_select_disable(
|
||||
struct Scene *scene, struct BMEditMesh *em, struct BMFace *efa,
|
||||
const int cd_loop_uv_offset);
|
||||
/* uv edge */
|
||||
void uvedit_edge_select_set(struct BMEditMesh *em, struct Scene *scene, struct BMLoop *l, const bool select,
|
||||
const bool do_history, const int cd_loop_uv_offset);
|
||||
void uvedit_edge_select_enable(struct BMEditMesh *em, struct Scene *scene, struct BMLoop *l,
|
||||
const bool do_history, const int cd_loop_uv_offset);
|
||||
void uvedit_edge_select_disable(struct BMEditMesh *em, struct Scene *scene, struct BMLoop *l,
|
||||
const int cd_loop_uv_offset);
|
||||
void uvedit_edge_select_set(
|
||||
struct BMEditMesh *em, struct Scene *scene, struct BMLoop *l, const bool select,
|
||||
const bool do_history, const int cd_loop_uv_offset);
|
||||
void uvedit_edge_select_enable(
|
||||
struct BMEditMesh *em, struct Scene *scene, struct BMLoop *l,
|
||||
const bool do_history, const int cd_loop_uv_offset);
|
||||
void uvedit_edge_select_disable(
|
||||
struct BMEditMesh *em, struct Scene *scene, struct BMLoop *l,
|
||||
const int cd_loop_uv_offset);
|
||||
/* uv vert */
|
||||
void uvedit_uv_select_set(struct BMEditMesh *em, struct Scene *scene, struct BMLoop *l, const bool select,
|
||||
const bool do_history, const int cd_loop_uv_offset);
|
||||
void uvedit_uv_select_enable(struct BMEditMesh *em, struct Scene *scene, struct BMLoop *l,
|
||||
const bool do_history, const int cd_loop_uv_offset);
|
||||
void uvedit_uv_select_disable(struct BMEditMesh *em, struct Scene *scene, struct BMLoop *l,
|
||||
const int cd_loop_uv_offset);
|
||||
void uvedit_uv_select_set(
|
||||
struct BMEditMesh *em, struct Scene *scene, struct BMLoop *l, const bool select,
|
||||
const bool do_history, const int cd_loop_uv_offset);
|
||||
void uvedit_uv_select_enable(
|
||||
struct BMEditMesh *em, struct Scene *scene, struct BMLoop *l,
|
||||
const bool do_history, const int cd_loop_uv_offset);
|
||||
void uvedit_uv_select_disable(
|
||||
struct BMEditMesh *em, struct Scene *scene, struct BMLoop *l,
|
||||
const int cd_loop_uv_offset);
|
||||
|
||||
bool ED_uvedit_nearest_uv(struct Scene *scene, struct Object *obedit, struct Image *ima,
|
||||
const float co[2], float r_uv[2]);
|
||||
bool ED_uvedit_nearest_uv(
|
||||
struct Scene *scene, struct Object *obedit, struct Image *ima,
|
||||
const float co[2], float r_uv[2]);
|
||||
|
||||
void ED_uvedit_get_aspect(struct Scene *scene, struct Object *ob, struct BMesh *em, float *aspx, float *aspy);
|
||||
|
||||
|
|
@ -102,7 +118,8 @@ void ED_uvedit_live_unwrap_re_solve(void);
|
|||
void ED_uvedit_live_unwrap_end(short cancel);
|
||||
|
||||
void ED_uvedit_live_unwrap(struct Scene *scene, struct Object *obedit);
|
||||
void ED_uvedit_pack_islands(struct Scene *scene, struct Object *ob, struct BMesh *bm, bool selected, bool correct_aspect, bool do_rotate);
|
||||
void ED_uvedit_pack_islands(
|
||||
struct Scene *scene, struct Object *ob, struct BMesh *bm, bool selected, bool correct_aspect, bool do_rotate);
|
||||
void ED_uvedit_unwrap_cube_project(
|
||||
struct BMesh *bm, float cube_size, bool use_select, const float center[3]);
|
||||
|
||||
|
|
@ -111,7 +128,8 @@ void ED_unwrap_lscm(struct Scene *scene, struct Object *obedit, const short sel)
|
|||
|
||||
|
||||
/* uvedit_draw.c */
|
||||
void ED_image_draw_cursor(struct ARegion *ar, const float cursor[2]);
|
||||
void ED_image_draw_cursor(
|
||||
struct ARegion *ar, const float cursor[2]);
|
||||
void ED_uvedit_draw_main(
|
||||
struct SpaceImage *sima, const struct EvaluationContext *eval_ctx,
|
||||
struct ARegion *ar, struct Scene *scene, struct ViewLayer *view_layer,
|
||||
|
|
|
|||
|
|
@ -93,7 +93,9 @@ static void uv_select_all_perform(Scene *scene, Image *ima, Object *obedit, BMEd
|
|||
static void uv_select_flush_from_tag_face(SpaceImage *sima, Scene *scene, Object *obedit, const bool select);
|
||||
static void uv_select_flush_from_tag_loop(SpaceImage *sima, Scene *scene, Object *obedit, const bool select);
|
||||
|
||||
/************************* state testing ************************/
|
||||
/* -------------------------------------------------------------------- */
|
||||
/** \name State Testing
|
||||
* \{ */
|
||||
|
||||
bool ED_uvedit_test(Object *obedit)
|
||||
{
|
||||
|
|
@ -134,15 +136,21 @@ static int UNUSED_FUNCTION(ED_operator_uvmap_mesh) (bContext *C)
|
|||
|
||||
return 0;
|
||||
}
|
||||
/**************************** object active image *****************************/
|
||||
|
||||
/** \} */
|
||||
|
||||
/* -------------------------------------------------------------------- */
|
||||
/** \name Object Active Image
|
||||
* \{ */
|
||||
|
||||
static bool is_image_texture_node(bNode *node)
|
||||
{
|
||||
return ELEM(node->type, SH_NODE_TEX_IMAGE, SH_NODE_TEX_ENVIRONMENT);
|
||||
}
|
||||
|
||||
bool ED_object_get_active_image(Object *ob, int mat_nr,
|
||||
Image **r_ima, ImageUser **r_iuser, bNode **r_node, bNodeTree **r_ntree)
|
||||
bool ED_object_get_active_image(
|
||||
Object *ob, int mat_nr,
|
||||
Image **r_ima, ImageUser **r_iuser, bNode **r_node, bNodeTree **r_ntree)
|
||||
{
|
||||
Material *ma = give_current_material(ob, mat_nr);
|
||||
bNodeTree *ntree = (ma && ma->use_nodes) ? ma->nodetree : NULL;
|
||||
|
|
@ -175,7 +183,11 @@ void ED_object_assign_active_image(Main *bmain, Object *ob, int mat_nr, Image *i
|
|||
}
|
||||
}
|
||||
|
||||
/************************* assign image ************************/
|
||||
/** \} */
|
||||
|
||||
/* -------------------------------------------------------------------- */
|
||||
/** \name Assign Image
|
||||
* \{ */
|
||||
|
||||
//#define USE_SWITCH_ASPECT
|
||||
|
||||
|
|
@ -266,7 +278,11 @@ void ED_uvedit_assign_image(Main *UNUSED(bmain), Scene *scene, Object *obedit, I
|
|||
|
||||
}
|
||||
|
||||
/*********************** space conversion *********************/
|
||||
/** \} */
|
||||
|
||||
/* -------------------------------------------------------------------- */
|
||||
/** \name Space Conversion
|
||||
* \{ */
|
||||
|
||||
static void uvedit_pixel_to_float(SpaceImage *sima, float *dist, float pixeldist)
|
||||
{
|
||||
|
|
@ -284,7 +300,11 @@ static void uvedit_pixel_to_float(SpaceImage *sima, float *dist, float pixeldist
|
|||
dist[1] = pixeldist / height;
|
||||
}
|
||||
|
||||
/*************** visibility and selection utilities **************/
|
||||
/** \} */
|
||||
|
||||
/* -------------------------------------------------------------------- */
|
||||
/** \name Visibility and Selection Utilities
|
||||
* \{ */
|
||||
|
||||
static void uvedit_vertex_select_tagged(BMEditMesh *em, Scene *scene, bool select, int cd_loop_uv_offset)
|
||||
{
|
||||
|
|
@ -324,8 +344,9 @@ bool uvedit_face_visible_test(Scene *scene, Object *obedit, Image *ima, BMFace *
|
|||
}
|
||||
}
|
||||
|
||||
bool uvedit_face_select_test(Scene *scene, BMFace *efa,
|
||||
const int cd_loop_uv_offset)
|
||||
bool uvedit_face_select_test(
|
||||
Scene *scene, BMFace *efa,
|
||||
const int cd_loop_uv_offset)
|
||||
{
|
||||
ToolSettings *ts = scene->toolsettings;
|
||||
if (ts->uv_flag & UV_SYNC_SELECTION) {
|
||||
|
|
@ -346,8 +367,9 @@ bool uvedit_face_select_test(Scene *scene, BMFace *efa,
|
|||
}
|
||||
}
|
||||
|
||||
bool uvedit_face_select_set(struct Scene *scene, struct BMEditMesh *em, struct BMFace *efa, const bool select,
|
||||
const bool do_history, const int cd_loop_uv_offset)
|
||||
bool uvedit_face_select_set(
|
||||
struct Scene *scene, struct BMEditMesh *em, struct BMFace *efa, const bool select,
|
||||
const bool do_history, const int cd_loop_uv_offset)
|
||||
{
|
||||
if (select) {
|
||||
return uvedit_face_select_enable(scene, em, efa, do_history, cd_loop_uv_offset);
|
||||
|
|
@ -357,8 +379,9 @@ bool uvedit_face_select_set(struct Scene *scene, struct BMEditMesh *em, struct B
|
|||
}
|
||||
}
|
||||
|
||||
bool uvedit_face_select_enable(Scene *scene, BMEditMesh *em, BMFace *efa, const bool do_history,
|
||||
const int cd_loop_uv_offset)
|
||||
bool uvedit_face_select_enable(
|
||||
Scene *scene, BMEditMesh *em, BMFace *efa, const bool do_history,
|
||||
const int cd_loop_uv_offset)
|
||||
{
|
||||
ToolSettings *ts = scene->toolsettings;
|
||||
|
||||
|
|
@ -384,8 +407,9 @@ bool uvedit_face_select_enable(Scene *scene, BMEditMesh *em, BMFace *efa, const
|
|||
return false;
|
||||
}
|
||||
|
||||
bool uvedit_face_select_disable(Scene *scene, BMEditMesh *em, BMFace *efa,
|
||||
const int cd_loop_uv_offset)
|
||||
bool uvedit_face_select_disable(
|
||||
Scene *scene, BMEditMesh *em, BMFace *efa,
|
||||
const int cd_loop_uv_offset)
|
||||
{
|
||||
ToolSettings *ts = scene->toolsettings;
|
||||
|
||||
|
|
@ -408,8 +432,9 @@ bool uvedit_face_select_disable(Scene *scene, BMEditMesh *em, BMFace *efa,
|
|||
return false;
|
||||
}
|
||||
|
||||
bool uvedit_edge_select_test(Scene *scene, BMLoop *l,
|
||||
const int cd_loop_uv_offset)
|
||||
bool uvedit_edge_select_test(
|
||||
Scene *scene, BMLoop *l,
|
||||
const int cd_loop_uv_offset)
|
||||
{
|
||||
ToolSettings *ts = scene->toolsettings;
|
||||
|
||||
|
|
@ -435,8 +460,9 @@ bool uvedit_edge_select_test(Scene *scene, BMLoop *l,
|
|||
}
|
||||
}
|
||||
|
||||
void uvedit_edge_select_set(BMEditMesh *em, Scene *scene, BMLoop *l, const bool select,
|
||||
const bool do_history, const int cd_loop_uv_offset)
|
||||
void uvedit_edge_select_set(
|
||||
BMEditMesh *em, Scene *scene, BMLoop *l, const bool select,
|
||||
const bool do_history, const int cd_loop_uv_offset)
|
||||
|
||||
{
|
||||
if (select) {
|
||||
|
|
@ -447,8 +473,9 @@ void uvedit_edge_select_set(BMEditMesh *em, Scene *scene, BMLoop *l, const bool
|
|||
}
|
||||
}
|
||||
|
||||
void uvedit_edge_select_enable(BMEditMesh *em, Scene *scene, BMLoop *l, const bool do_history,
|
||||
const int cd_loop_uv_offset)
|
||||
void uvedit_edge_select_enable(
|
||||
BMEditMesh *em, Scene *scene, BMLoop *l, const bool do_history,
|
||||
const int cd_loop_uv_offset)
|
||||
|
||||
{
|
||||
ToolSettings *ts = scene->toolsettings;
|
||||
|
|
@ -478,8 +505,9 @@ void uvedit_edge_select_enable(BMEditMesh *em, Scene *scene, BMLoop *l, const bo
|
|||
}
|
||||
}
|
||||
|
||||
void uvedit_edge_select_disable(BMEditMesh *em, Scene *scene, BMLoop *l,
|
||||
const int cd_loop_uv_offset)
|
||||
void uvedit_edge_select_disable(
|
||||
BMEditMesh *em, Scene *scene, BMLoop *l,
|
||||
const int cd_loop_uv_offset)
|
||||
|
||||
{
|
||||
ToolSettings *ts = scene->toolsettings;
|
||||
|
|
@ -505,8 +533,9 @@ void uvedit_edge_select_disable(BMEditMesh *em, Scene *scene, BMLoop *l,
|
|||
}
|
||||
}
|
||||
|
||||
bool uvedit_uv_select_test(Scene *scene, BMLoop *l,
|
||||
const int cd_loop_uv_offset)
|
||||
bool uvedit_uv_select_test(
|
||||
Scene *scene, BMLoop *l,
|
||||
const int cd_loop_uv_offset)
|
||||
{
|
||||
ToolSettings *ts = scene->toolsettings;
|
||||
|
||||
|
|
@ -522,8 +551,9 @@ bool uvedit_uv_select_test(Scene *scene, BMLoop *l,
|
|||
}
|
||||
}
|
||||
|
||||
void uvedit_uv_select_set(BMEditMesh *em, Scene *scene, BMLoop *l, const bool select,
|
||||
const bool do_history, const int cd_loop_uv_offset)
|
||||
void uvedit_uv_select_set(
|
||||
BMEditMesh *em, Scene *scene, BMLoop *l, const bool select,
|
||||
const bool do_history, const int cd_loop_uv_offset)
|
||||
{
|
||||
if (select) {
|
||||
uvedit_uv_select_enable(em, scene, l, do_history, cd_loop_uv_offset);
|
||||
|
|
@ -533,8 +563,9 @@ void uvedit_uv_select_set(BMEditMesh *em, Scene *scene, BMLoop *l, const bool se
|
|||
}
|
||||
}
|
||||
|
||||
void uvedit_uv_select_enable(BMEditMesh *em, Scene *scene, BMLoop *l,
|
||||
const bool do_history, const int cd_loop_uv_offset)
|
||||
void uvedit_uv_select_enable(
|
||||
BMEditMesh *em, Scene *scene, BMLoop *l,
|
||||
const bool do_history, const int cd_loop_uv_offset)
|
||||
{
|
||||
ToolSettings *ts = scene->toolsettings;
|
||||
|
||||
|
|
@ -554,8 +585,9 @@ void uvedit_uv_select_enable(BMEditMesh *em, Scene *scene, BMLoop *l,
|
|||
}
|
||||
}
|
||||
|
||||
void uvedit_uv_select_disable(BMEditMesh *em, Scene *scene, BMLoop *l,
|
||||
const int cd_loop_uv_offset)
|
||||
void uvedit_uv_select_disable(
|
||||
BMEditMesh *em, Scene *scene, BMLoop *l,
|
||||
const int cd_loop_uv_offset)
|
||||
{
|
||||
ToolSettings *ts = scene->toolsettings;
|
||||
|
||||
|
|
@ -571,7 +603,11 @@ void uvedit_uv_select_disable(BMEditMesh *em, Scene *scene, BMLoop *l,
|
|||
}
|
||||
}
|
||||
|
||||
/*********************** live unwrap utilities ***********************/
|
||||
/** \} */
|
||||
|
||||
/* -------------------------------------------------------------------- */
|
||||
/** \name Live Unwrap Utilities
|
||||
* \{ */
|
||||
|
||||
void uvedit_live_unwrap_update(SpaceImage *sima, Scene *scene, Object *obedit)
|
||||
{
|
||||
|
|
@ -582,7 +618,12 @@ void uvedit_live_unwrap_update(SpaceImage *sima, Scene *scene, Object *obedit)
|
|||
}
|
||||
}
|
||||
|
||||
/*********************** geometric utilities ***********************/
|
||||
/** \} */
|
||||
|
||||
/* -------------------------------------------------------------------- */
|
||||
/** \name Geometric Utilities
|
||||
* \{ */
|
||||
|
||||
void uv_poly_center(BMFace *f, float r_cent[2], const int cd_loop_uv_offset)
|
||||
{
|
||||
BMLoop *l;
|
||||
|
|
@ -705,7 +746,11 @@ bool ED_uvedit_center(Scene *scene, Image *ima, Object *obedit, float cent[2], c
|
|||
return changed;
|
||||
}
|
||||
|
||||
/************************** find nearest ****************************/
|
||||
/** \} */
|
||||
|
||||
/* -------------------------------------------------------------------- */
|
||||
/** \name Find Nearest Elements
|
||||
* \{ */
|
||||
|
||||
bool uv_find_nearest_edge(
|
||||
Scene *scene, Image *ima, Object *obedit, const float co[2],
|
||||
|
|
@ -792,8 +837,9 @@ bool uv_find_nearest_face(
|
|||
return found;
|
||||
}
|
||||
|
||||
static bool uv_nearest_between(const BMLoop *l, const float co[2],
|
||||
const int cd_loop_uv_offset)
|
||||
static bool uv_nearest_between(
|
||||
const BMLoop *l, const float co[2],
|
||||
const int cd_loop_uv_offset)
|
||||
{
|
||||
const float *uv_prev = ((MLoopUV *)BM_ELEM_CD_GET_VOID_P(l->prev, cd_loop_uv_offset))->uv;
|
||||
const float *uv_curr = ((MLoopUV *)BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset))->uv;
|
||||
|
|
@ -907,7 +953,11 @@ bool ED_uvedit_nearest_uv(Scene *scene, Object *obedit, Image *ima, const float
|
|||
return found;
|
||||
}
|
||||
|
||||
/*********************** loop select ***********************/
|
||||
/** \} */
|
||||
|
||||
/* -------------------------------------------------------------------- */
|
||||
/** \name Loop Select
|
||||
* \{ */
|
||||
|
||||
static void uv_select_edgeloop_vertex_loop_flag(UvMapVert *first)
|
||||
{
|
||||
|
|
@ -1091,7 +1141,11 @@ static int uv_select_edgeloop(
|
|||
return (select) ? 1 : -1;
|
||||
}
|
||||
|
||||
/*********************** linked select ***********************/
|
||||
/** \} */
|
||||
|
||||
/* -------------------------------------------------------------------- */
|
||||
/** \name Select Linked
|
||||
* \{ */
|
||||
|
||||
static void uv_select_linked(
|
||||
Scene *scene, Image *ima, Object *obedit, BMEditMesh *em, const float limit[2],
|
||||
|
|
@ -1306,6 +1360,12 @@ static float *uv_sel_co_from_eve(Scene *scene, Object *obedit, Image *ima, BMEdi
|
|||
return NULL;
|
||||
}
|
||||
|
||||
/** \} */
|
||||
|
||||
/* -------------------------------------------------------------------- */
|
||||
/** \name Select More/Less Operator
|
||||
* \{ */
|
||||
|
||||
static int uv_select_more_less(bContext *C, const bool select)
|
||||
{
|
||||
Scene *scene = CTX_data_scene(C);
|
||||
|
|
@ -1441,7 +1501,11 @@ static void UV_OT_select_less(wmOperatorType *ot)
|
|||
ot->poll = ED_operator_uvedit_space_image;
|
||||
}
|
||||
|
||||
/* ******************** align operator **************** */
|
||||
/** \} */
|
||||
|
||||
/* -------------------------------------------------------------------- */
|
||||
/** \name Weld Align Operator
|
||||
* \{ */
|
||||
|
||||
static void uv_weld_align(bContext *C, int tool)
|
||||
{
|
||||
|
|
@ -1545,8 +1609,10 @@ static void uv_weld_align(bContext *C, int tool)
|
|||
|
||||
/* flush vertex tags to edges */
|
||||
BM_ITER_MESH (eed, &iter, em->bm, BM_EDGES_OF_MESH) {
|
||||
BM_elem_flag_set(eed, BM_ELEM_TAG, (BM_elem_flag_test(eed->v1, BM_ELEM_TAG) &&
|
||||
BM_elem_flag_test(eed->v2, BM_ELEM_TAG)));
|
||||
BM_elem_flag_set(
|
||||
eed, BM_ELEM_TAG,
|
||||
(BM_elem_flag_test(eed->v1, BM_ELEM_TAG) &&
|
||||
BM_elem_flag_test(eed->v2, BM_ELEM_TAG)));
|
||||
}
|
||||
|
||||
/* find a vertex with only one tagged edge */
|
||||
|
|
@ -1692,7 +1758,12 @@ static void UV_OT_align(wmOperatorType *ot)
|
|||
/* properties */
|
||||
RNA_def_enum(ot->srna, "axis", axis_items, 'a', "Axis", "Axis to align UV locations on");
|
||||
}
|
||||
/* ******************** weld near operator **************** */
|
||||
|
||||
/** \} */
|
||||
|
||||
/* -------------------------------------------------------------------- */
|
||||
/** \name Remove Doubles Operator
|
||||
* \{ */
|
||||
|
||||
typedef struct UVvert {
|
||||
MLoopUV *uv_loop;
|
||||
|
|
@ -1730,7 +1801,7 @@ static int uv_remove_doubles_exec(bContext *C, wmOperator *op)
|
|||
MLoopUV **loop_arr = NULL;
|
||||
BLI_array_declare(loop_arr);
|
||||
|
||||
/* TODO, use qsort as with MESH_OT_remove_doubles, this isn't optimal */
|
||||
/* TODO, use kd-tree as with MESH_OT_remove_doubles, this isn't optimal */
|
||||
BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
|
||||
if (!uvedit_face_visible_test(scene, obedit, ima, efa))
|
||||
continue;
|
||||
|
|
@ -1853,7 +1924,12 @@ static void UV_OT_remove_doubles(wmOperatorType *ot)
|
|||
"Merge Distance", "Maximum distance between welded vertices", 0.0f, 1.0f);
|
||||
RNA_def_boolean(ot->srna, "use_unselected", 0, "Unselected", "Merge selected to other unselected vertices");
|
||||
}
|
||||
/* ******************** weld operator **************** */
|
||||
|
||||
/** \} */
|
||||
|
||||
/* -------------------------------------------------------------------- */
|
||||
/** \name Weld Near Operator
|
||||
* \{ */
|
||||
|
||||
static int uv_weld_exec(bContext *C, wmOperator *UNUSED(op))
|
||||
{
|
||||
|
|
@ -1875,8 +1951,11 @@ static void UV_OT_weld(wmOperatorType *ot)
|
|||
ot->poll = ED_operator_uvedit;
|
||||
}
|
||||
|
||||
/** \} */
|
||||
|
||||
/* ******************** (de)select all operator **************** */
|
||||
/* -------------------------------------------------------------------- */
|
||||
/** \name (De)Select All Operator
|
||||
* \{ */
|
||||
|
||||
static void uv_select_all_perform(Scene *scene, Image *ima, Object *obedit, BMEditMesh *em, int action)
|
||||
{
|
||||
|
|
@ -1979,7 +2058,11 @@ static void UV_OT_select_all(wmOperatorType *ot)
|
|||
WM_operator_properties_select_all(ot);
|
||||
}
|
||||
|
||||
/* ******************** mouse select operator **************** */
|
||||
/** \} */
|
||||
|
||||
/* -------------------------------------------------------------------- */
|
||||
/** \name Mouse Select Operator
|
||||
* \{ */
|
||||
|
||||
static bool uv_sticky_select(float *limit, int hitv[], int v, float *hituv[], float *uv, int sticky, int hitlen)
|
||||
{
|
||||
|
|
@ -2300,7 +2383,11 @@ static void UV_OT_select(wmOperatorType *ot)
|
|||
"Location", "Mouse location in normalized coordinates, 0.0 to 1.0 is within the image bounds", -100.0f, 100.0f);
|
||||
}
|
||||
|
||||
/* ******************** loop select operator **************** */
|
||||
/** \} */
|
||||
|
||||
/* -------------------------------------------------------------------- */
|
||||
/** \name Loop Select Operator
|
||||
* \{ */
|
||||
|
||||
static int uv_select_loop_exec(bContext *C, wmOperator *op)
|
||||
{
|
||||
|
|
@ -2345,7 +2432,11 @@ static void UV_OT_select_loop(wmOperatorType *ot)
|
|||
"Location", "Mouse location in normalized coordinates, 0.0 to 1.0 is within the image bounds", -100.0f, 100.0f);
|
||||
}
|
||||
|
||||
/* ******************** linked select operator **************** */
|
||||
/** \} */
|
||||
|
||||
/* -------------------------------------------------------------------- */
|
||||
/** \name Select Linked Operator
|
||||
* \{ */
|
||||
|
||||
static int uv_select_linked_internal(bContext *C, wmOperator *op, const wmEvent *event, int pick)
|
||||
{
|
||||
|
|
@ -2553,17 +2644,21 @@ static void uv_select_sync_flush(ToolSettings *ts, BMEditMesh *em, const short s
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
/** \} */
|
||||
|
||||
/* -------------------------------------------------------------------- */
|
||||
/* Utility functions to flush the uv-selection from tags */
|
||||
/** \name Select/Tag Flushing Utils
|
||||
*
|
||||
* Utility functions to flush the uv-selection from tags.
|
||||
* \{ */
|
||||
|
||||
/**
|
||||
* helper function for #uv_select_flush_from_tag_loop and uv_select_flush_from_tag_face
|
||||
*/
|
||||
static void uv_select_flush_from_tag_sticky_loc_internal(Scene *scene, BMEditMesh *em, UvVertMap *vmap,
|
||||
const unsigned int efa_index, BMLoop *l,
|
||||
const bool select, const int cd_loop_uv_offset)
|
||||
static void uv_select_flush_from_tag_sticky_loc_internal(
|
||||
Scene *scene, BMEditMesh *em, UvVertMap *vmap,
|
||||
const unsigned int efa_index, BMLoop *l,
|
||||
const bool select, const int cd_loop_uv_offset)
|
||||
{
|
||||
UvMapVert *start_vlist = NULL, *vlist_iter;
|
||||
BMFace *efa_vlist;
|
||||
|
|
@ -2666,8 +2761,9 @@ static void uv_select_flush_from_tag_face(SpaceImage *sima, Scene *scene, Object
|
|||
/* tf = BM_ELEM_CD_GET_VOID_P(efa, cd_poly_tex_offset); */ /* UNUSED */
|
||||
|
||||
BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
|
||||
uv_select_flush_from_tag_sticky_loc_internal(scene, em, vmap, efa_index, l,
|
||||
select, cd_loop_uv_offset);
|
||||
uv_select_flush_from_tag_sticky_loc_internal(
|
||||
scene, em, vmap, efa_index, l,
|
||||
select, cd_loop_uv_offset);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -2752,8 +2848,9 @@ static void uv_select_flush_from_tag_loop(SpaceImage *sima, Scene *scene, Object
|
|||
|
||||
BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
|
||||
if (BM_elem_flag_test(l, BM_ELEM_TAG)) {
|
||||
uv_select_flush_from_tag_sticky_loc_internal(scene, em, vmap, efa_index, l,
|
||||
select, cd_loop_uv_offset);
|
||||
uv_select_flush_from_tag_sticky_loc_internal(
|
||||
scene, em, vmap, efa_index, l,
|
||||
select, cd_loop_uv_offset);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -2771,7 +2868,11 @@ static void uv_select_flush_from_tag_loop(SpaceImage *sima, Scene *scene, Object
|
|||
}
|
||||
}
|
||||
|
||||
/* ******************** border select operator **************** */
|
||||
/** \} */
|
||||
|
||||
/* -------------------------------------------------------------------- */
|
||||
/** \name Border Select Operator
|
||||
* \{ */
|
||||
|
||||
static int uv_border_select_exec(bContext *C, wmOperator *op)
|
||||
{
|
||||
|
|
@ -2788,9 +2889,10 @@ static int uv_border_select_exec(bContext *C, wmOperator *op)
|
|||
MLoopUV *luv;
|
||||
rctf rectf;
|
||||
bool changed, pinned, select, extend;
|
||||
const bool use_face_center = (ts->uv_flag & UV_SYNC_SELECTION) ?
|
||||
(ts->selectmode == SCE_SELECT_FACE) :
|
||||
(ts->uv_selectmode == UV_SELECT_FACE);
|
||||
const bool use_face_center = (
|
||||
(ts->uv_flag & UV_SYNC_SELECTION) ?
|
||||
(ts->selectmode == SCE_SELECT_FACE) :
|
||||
(ts->uv_selectmode == UV_SELECT_FACE));
|
||||
|
||||
const int cd_loop_uv_offset = CustomData_get_offset(&em->bm->ldata, CD_MLOOPUV);
|
||||
|
||||
|
|
@ -2900,7 +3002,11 @@ static void UV_OT_select_border(wmOperatorType *ot)
|
|||
WM_operator_properties_gesture_border_select(ot);
|
||||
}
|
||||
|
||||
/* ******************** circle select operator **************** */
|
||||
/** \} */
|
||||
|
||||
/* -------------------------------------------------------------------- */
|
||||
/** \name Circle Select Operator
|
||||
* \{ */
|
||||
|
||||
static int uv_inside_circle(const float uv[2], const float offset[2], const float ellipse[2])
|
||||
{
|
||||
|
|
@ -2927,9 +3033,10 @@ static int uv_circle_select_exec(bContext *C, wmOperator *op)
|
|||
float zoomx, zoomy, offset[2], ellipse[2];
|
||||
const bool select = !RNA_boolean_get(op->ptr, "deselect");
|
||||
bool changed = false;
|
||||
const bool use_face_center = (ts->uv_flag & UV_SYNC_SELECTION) ?
|
||||
(ts->selectmode == SCE_SELECT_FACE) :
|
||||
(ts->uv_selectmode == UV_SELECT_FACE);
|
||||
const bool use_face_center = (
|
||||
(ts->uv_flag & UV_SYNC_SELECTION) ?
|
||||
(ts->selectmode == SCE_SELECT_FACE) :
|
||||
(ts->uv_selectmode == UV_SELECT_FACE));
|
||||
|
||||
const int cd_loop_uv_offset = CustomData_get_offset(&em->bm->ldata, CD_MLOOPUV);
|
||||
|
||||
|
|
@ -3018,11 +3125,15 @@ static void UV_OT_circle_select(wmOperatorType *ot)
|
|||
WM_operator_properties_gesture_circle_select(ot);
|
||||
}
|
||||
|
||||
/** \} */
|
||||
|
||||
/* ******************** lasso select operator **************** */
|
||||
/* -------------------------------------------------------------------- */
|
||||
/** \name Lasso Select Operator
|
||||
* \{ */
|
||||
|
||||
static bool do_lasso_select_mesh_uv(bContext *C, const int mcords[][2], short moves,
|
||||
const bool select, const bool extend)
|
||||
static bool do_lasso_select_mesh_uv(
|
||||
bContext *C, const int mcords[][2], short moves,
|
||||
const bool select, const bool extend)
|
||||
{
|
||||
SpaceImage *sima = CTX_wm_space_image(C);
|
||||
Image *ima = CTX_data_edit_image(C);
|
||||
|
|
@ -3083,9 +3194,10 @@ static bool do_lasso_select_mesh_uv(bContext *C, const int mcords[][2], short mo
|
|||
BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
|
||||
if ((select) != (uvedit_uv_select_test(scene, l, cd_loop_uv_offset))) {
|
||||
MLoopUV *luv = BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset);
|
||||
if (UI_view2d_view_to_region_clip(&ar->v2d,
|
||||
luv->uv[0], luv->uv[1],
|
||||
&screen_uv[0], &screen_uv[1]) &&
|
||||
if (UI_view2d_view_to_region_clip(
|
||||
&ar->v2d,
|
||||
luv->uv[0], luv->uv[1],
|
||||
&screen_uv[0], &screen_uv[1]) &&
|
||||
BLI_rcti_isect_pt_v(&rect, screen_uv) &&
|
||||
BLI_lasso_is_point_inside(mcords, moves, screen_uv[0], screen_uv[1], V2D_IS_CLIPPED))
|
||||
{
|
||||
|
|
@ -3154,9 +3266,11 @@ static void UV_OT_select_lasso(wmOperatorType *ot)
|
|||
WM_operator_properties_gesture_lasso_select(ot);
|
||||
}
|
||||
|
||||
/** \} */
|
||||
|
||||
|
||||
/* ******************** snap cursor operator **************** */
|
||||
/* -------------------------------------------------------------------- */
|
||||
/** \name Snap Cursor Operator
|
||||
* \{ */
|
||||
|
||||
static void uv_snap_to_pixel(float uvco[2], float w, float h)
|
||||
{
|
||||
|
|
@ -3224,7 +3338,11 @@ static void UV_OT_snap_cursor(wmOperatorType *ot)
|
|||
RNA_def_enum(ot->srna, "target", target_items, 0, "Target", "Target to snap the selected UVs to");
|
||||
}
|
||||
|
||||
/* ******************** snap selection operator **************** */
|
||||
/** \} */
|
||||
|
||||
/* -------------------------------------------------------------------- */
|
||||
/** \name Snap Selection Operator
|
||||
* \{ */
|
||||
|
||||
static bool uv_snap_uvs_to_cursor(Scene *scene, Image *ima, Object *obedit, const float cursor[2])
|
||||
{
|
||||
|
|
@ -3433,7 +3551,11 @@ static void UV_OT_snap_selected(wmOperatorType *ot)
|
|||
RNA_def_enum(ot->srna, "target", target_items, 0, "Target", "Target to snap the selected UVs to");
|
||||
}
|
||||
|
||||
/* ******************** pin operator **************** */
|
||||
/** \} */
|
||||
|
||||
/* -------------------------------------------------------------------- */
|
||||
/** \name Pin UV's Operator
|
||||
* \{ */
|
||||
|
||||
static int uv_pin_exec(bContext *C, wmOperator *op)
|
||||
{
|
||||
|
|
@ -3488,7 +3610,11 @@ static void UV_OT_pin(wmOperatorType *ot)
|
|||
RNA_def_boolean(ot->srna, "clear", 0, "Clear", "Clear pinning for the selection instead of setting it");
|
||||
}
|
||||
|
||||
/******************* select pinned operator ***************/
|
||||
/** \} */
|
||||
|
||||
/* -------------------------------------------------------------------- */
|
||||
/** \name Select Pinned UV's Operator
|
||||
* \{ */
|
||||
|
||||
static int uv_select_pinned_exec(bContext *C, wmOperator *UNUSED(op))
|
||||
{
|
||||
|
|
@ -3533,15 +3659,20 @@ static void UV_OT_select_pinned(wmOperatorType *ot)
|
|||
ot->poll = ED_operator_uvedit;
|
||||
}
|
||||
|
||||
/********************** hide operator *********************/
|
||||
/** \} */
|
||||
|
||||
/* -------------------------------------------------------------------- */
|
||||
/** \name Hide Operator
|
||||
* \{ */
|
||||
|
||||
/* check if we are selected or unselected based on 'bool_test' arg,
|
||||
* needed for select swap support */
|
||||
#define UV_SEL_TEST(luv, bool_test) ((((luv)->flag & MLOOPUV_VERTSEL) == MLOOPUV_VERTSEL) == bool_test)
|
||||
|
||||
/* is every UV vert selected or unselected depending on bool_test */
|
||||
static bool bm_face_is_all_uv_sel(BMFace *f, bool select_test,
|
||||
const int cd_loop_uv_offset)
|
||||
static bool bm_face_is_all_uv_sel(
|
||||
BMFace *f, bool select_test,
|
||||
const int cd_loop_uv_offset)
|
||||
{
|
||||
BMLoop *l_iter;
|
||||
BMLoop *l_first;
|
||||
|
|
@ -3667,7 +3798,11 @@ static void UV_OT_hide(wmOperatorType *ot)
|
|||
RNA_def_boolean(ot->srna, "unselected", 0, "Unselected", "Hide unselected rather than selected");
|
||||
}
|
||||
|
||||
/****************** reveal operator ******************/
|
||||
/** \} */
|
||||
|
||||
/* -------------------------------------------------------------------- */
|
||||
/** \name Reveal Operator
|
||||
* \{ */
|
||||
|
||||
static int uv_reveal_exec(bContext *C, wmOperator *op)
|
||||
{
|
||||
|
|
@ -3802,7 +3937,11 @@ static void UV_OT_reveal(wmOperatorType *ot)
|
|||
RNA_def_boolean(ot->srna, "select", true, "Select", "");
|
||||
}
|
||||
|
||||
/******************** set 3d cursor operator ********************/
|
||||
/** \} */
|
||||
|
||||
/* -------------------------------------------------------------------- */
|
||||
/** \name Set 2D Cursor Operator
|
||||
* \{ */
|
||||
|
||||
static int uv_set_2d_cursor_poll(bContext *C)
|
||||
{
|
||||
|
|
@ -3865,6 +4004,12 @@ static void UV_OT_cursor_set(wmOperatorType *ot)
|
|||
"Cursor location in normalized (0.0-1.0) coordinates", -10.0f, 10.0f);
|
||||
}
|
||||
|
||||
/** \} */
|
||||
|
||||
/* -------------------------------------------------------------------- */
|
||||
/** \name Seam from UV Islands Operator
|
||||
* \{ */
|
||||
|
||||
static int uv_seams_from_islands_exec(bContext *C, wmOperator *op)
|
||||
{
|
||||
UvVertMap *vmap;
|
||||
|
|
@ -3999,6 +4144,12 @@ static void UV_OT_seams_from_islands(wmOperatorType *ot)
|
|||
RNA_def_boolean(ot->srna, "mark_sharp", 0, "Mark Sharp", "Mark boundary edges as sharp");
|
||||
}
|
||||
|
||||
/** \} */
|
||||
|
||||
/* -------------------------------------------------------------------- */
|
||||
/** \name Mark Seam Operator
|
||||
* \{ */
|
||||
|
||||
static int uv_mark_seam_exec(bContext *C, wmOperator *op)
|
||||
{
|
||||
Object *ob = CTX_data_edit_object(C);
|
||||
|
|
@ -4071,8 +4222,11 @@ static void UV_OT_mark_seam(wmOperatorType *ot)
|
|||
RNA_def_boolean(ot->srna, "clear", false, "Clear Seams", "Clear instead of marking seams");
|
||||
}
|
||||
|
||||
/** \} */
|
||||
|
||||
/* ************************** registration **********************************/
|
||||
/* -------------------------------------------------------------------- */
|
||||
/** \name Operator Registration & Keymap
|
||||
* \{ */
|
||||
|
||||
void ED_operatortypes_uvedit(void)
|
||||
{
|
||||
|
|
@ -4206,3 +4360,4 @@ void ED_keymap_uvedit(wmKeyConfig *keyconf)
|
|||
transform_keymap_for_space(keyconf, keymap, SPACE_IMAGE);
|
||||
}
|
||||
|
||||
/** \} */
|
||||
|
|
|
|||
|
|
@ -547,20 +547,22 @@ if(WITH_CYCLES)
|
|||
add_cycles_render_test(opengl)
|
||||
endif()
|
||||
add_cycles_render_test(bake)
|
||||
add_cycles_render_test(bsdf)
|
||||
add_cycles_render_test(denoise)
|
||||
add_cycles_render_test(displacement)
|
||||
add_cycles_render_test(hair)
|
||||
add_cycles_render_test(image_data_types)
|
||||
add_cycles_render_test(image_mapping)
|
||||
add_cycles_render_test(image_texture_limit)
|
||||
add_cycles_render_test(integrator)
|
||||
add_cycles_render_test(light)
|
||||
add_cycles_render_test(mblur)
|
||||
add_cycles_render_test(mesh)
|
||||
add_cycles_render_test(motion_blur)
|
||||
add_cycles_render_test(render_layer)
|
||||
add_cycles_render_test(reports)
|
||||
add_cycles_render_test(render)
|
||||
add_cycles_render_test(shader)
|
||||
add_cycles_render_test(shader_tangent)
|
||||
add_cycles_render_test(shadow_catcher)
|
||||
add_cycles_render_test(sss)
|
||||
add_cycles_render_test(texture_space)
|
||||
add_cycles_render_test(volume)
|
||||
else()
|
||||
MESSAGE(STATUS "Disabling Cycles tests because tests folder does not exist")
|
||||
|
|
|
|||
Loading…
Reference in New Issue