Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-04-18 20:20:06 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-04-18 20:22:00 +0300
commit69c42ad57bd614284810d2c9cd34ede320f6f587 (patch)
tree1ba4502498f7dad65d85a7ec0e8a3b53d876ded8 /source/blender/editors/uvedit
parent4704f2687a519f1d9a1fe7984da82c30d5f14227 (diff)
Cleanup: consistent changed_multi assignment
Diffstat (limited to 'source/blender/editors/uvedit')
-rw-r--r--source/blender/editors/uvedit/uvedit_ops.c12
-rw-r--r--source/blender/editors/uvedit/uvedit_unwrap_ops.c2
2 files changed, 6 insertions, 8 deletions
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);