From 69c42ad57bd614284810d2c9cd34ede320f6f587 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 18 Apr 2018 19:20:06 +0200 Subject: Cleanup: consistent changed_multi assignment --- source/blender/editors/uvedit/uvedit_ops.c | 12 +++++------- source/blender/editors/uvedit/uvedit_unwrap_ops.c | 2 +- 2 files changed, 6 insertions(+), 8 deletions(-) (limited to 'source/blender/editors/uvedit') diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c index e8e20c1cad5..06b408a04ae 100644 --- a/source/blender/editors/uvedit/uvedit_ops.c +++ b/source/blender/editors/uvedit/uvedit_ops.c @@ -3127,21 +3127,19 @@ static int uv_border_select_exec(bContext *C, wmOperator *op) } if (changed) { + changed_multi = true; + uv_select_sync_flush(ts, em, select); if (ts->uv_flag & UV_SYNC_SELECTION) { WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data); } } - changed_multi |= changed; } MEM_SAFE_FREE(objects); - if (changed_multi) { - return OPERATOR_FINISHED; - } - return OPERATOR_CANCELLED; + return changed_multi ? OPERATOR_FINISHED : OPERATOR_CANCELLED; } static void UV_OT_select_border(wmOperatorType *ot) @@ -3391,14 +3389,14 @@ static bool do_lasso_select_mesh_uv(bContext *C, const int mcords[][2], short mo } if (changed) { + changed_multi = true; + uv_select_sync_flush(scene->toolsettings, em, select); if (ts->uv_flag & UV_SYNC_SELECTION) { WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data); } } - - changed_multi |= changed; } return changed_multi; diff --git a/source/blender/editors/uvedit/uvedit_unwrap_ops.c b/source/blender/editors/uvedit/uvedit_unwrap_ops.c index 828f84855ce..7c87905775b 100644 --- a/source/blender/editors/uvedit/uvedit_unwrap_ops.c +++ b/source/blender/editors/uvedit/uvedit_unwrap_ops.c @@ -1542,11 +1542,11 @@ static int uv_from_view_exec(bContext *C, wmOperator *op) } if (changed) { + changed_multi = true; uv_map_clip_correct(scene, obedit, em, op); DEG_id_tag_update(obedit->data, 0); WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data); - changed_multi = true; } } MEM_SAFE_FREE(objects); -- cgit v1.2.3