diff options
author | Clément Foucault <foucault.clem@gmail.com> | 2018-09-25 00:18:02 +0300 |
---|---|---|
committer | Clément Foucault <foucault.clem@gmail.com> | 2018-09-25 23:51:54 +0300 |
commit | a3bb385ca0ba37bf1cdc1b74de9ce872b262fb95 (patch) | |
tree | 250974f326d38cf9bebec98ad5b79a2fb64add10 /source/blender/editors/uvedit | |
parent | 7cc9998809359dead38bd20de851494e11ab3da1 (diff) |
Edit Mesh: Move Edit Mesh display settings to overlay's
This makes the Edit Mesh display settings common to all objects. They can
also be set differently per viewport.
Modifying extra data (seams, sharp edges etc...) will no longer set them
automaticaly visible.
Bumping version because we need to force set all extra draw options for
older files.
Diffstat (limited to 'source/blender/editors/uvedit')
-rw-r--r-- | source/blender/editors/uvedit/uvedit_draw.c | 2 | ||||
-rw-r--r-- | source/blender/editors/uvedit/uvedit_ops.c | 9 |
2 files changed, 1 insertions, 10 deletions
diff --git a/source/blender/editors/uvedit/uvedit_draw.c b/source/blender/editors/uvedit/uvedit_draw.c index 8b2c98ad5cc..57fed0b860f 100644 --- a/source/blender/editors/uvedit/uvedit_draw.c +++ b/source/blender/editors/uvedit/uvedit_draw.c @@ -679,7 +679,7 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit, Depsgraph * GPU_line_width(1.0f); UI_GetThemeColor4fv(TH_WIRE_EDIT, col2); - if (me->drawflag & ME_DRAWEDGES) { + if ((sima->flag & SI_NO_DRAWEDGES) == 0) { int sel; UI_GetThemeColor4fv(TH_EDGE_SELECT, col1); diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c index 1888d4ace83..5ea16a6026f 100644 --- a/source/blender/editors/uvedit/uvedit_ops.c +++ b/source/blender/editors/uvedit/uvedit_ops.c @@ -4505,13 +4505,6 @@ static int uv_seams_from_islands_exec(bContext *C, wmOperator *op) } } - if (mark_seams) { - me->drawflag |= ME_DRAWSEAMS; - } - if (mark_sharp) { - me->drawflag |= ME_DRAWSHARP; - } - BM_uv_vert_map_free(vmap); DEG_id_tag_update(&me->id, 0); @@ -4587,8 +4580,6 @@ static int uv_mark_seam_exec(bContext *C, wmOperator *op) } if (changed) { - me->drawflag |= ME_DRAWSEAMS; - if (scene->toolsettings->edge_mode_live_unwrap) { ED_unwrap_lscm(scene, ob, false, false); } |