diff options
Diffstat (limited to 'source/blender/editors/uvedit/uvedit_ops.c')
| -rw-r--r-- | source/blender/editors/uvedit/uvedit_ops.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c index 71d557f6fc7..1071e0f12e8 100644 --- a/source/blender/editors/uvedit/uvedit_ops.c +++ b/source/blender/editors/uvedit/uvedit_ops.c @@ -170,7 +170,7 @@ void ED_object_assign_active_image(Main *bmain, Object *ob, int mat_nr, Image *i if (node && is_image_texture_node(node)) { node->id = &ima->id; - ED_node_tag_update_nodetree(bmain, ma->nodetree); + ED_node_tag_update_nodetree(bmain, ma->nodetree, node); } } @@ -727,7 +727,7 @@ static bool uvedit_center(Scene *scene, Image *ima, Object *obedit, float cent[2 { bool changed = false; - if (mode == V3D_CENTER) { /* bounding box */ + if (mode == V3D_AROUND_CENTER_BOUNDS) { /* bounding box */ float min[2], max[2]; if (ED_uvedit_minmax(scene, ima, obedit, min, max)) { mid_v2_v2v2(cent, min, max); @@ -4119,7 +4119,13 @@ static int uv_seams_from_islands_exec(bContext *C, wmOperator *op) } } - me->drawflag |= ME_DRAWSEAMS; + if (mark_seams) { + me->drawflag |= ME_DRAWSEAMS; + } + if (mark_sharp) { + me->drawflag |= ME_DRAWSHARP; + } + BM_uv_vert_map_free(vmap); @@ -4189,6 +4195,10 @@ static int uv_mark_seam_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSE uiPopupMenu *pup; uiLayout *layout; + if (RNA_struct_property_is_set(op->ptr, "clear")) { + return uv_mark_seam_exec(C, op); + } + pup = UI_popup_menu_begin(C, IFACE_("Edges"), ICON_NONE); layout = UI_popup_menu_layout(pup); |