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:
authorSergey Sharybin <sergey.vfx@gmail.com>2020-02-11 12:12:43 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2020-02-11 16:04:13 +0300
commit3dcddf83bfd48a47716de10626c19ef3ce48d021 (patch)
tree2a3d26077a9c9f3cff8d103e09dbb372733f1312
parentd2ff21e75de906d90f3d338871ca35756e94bfea (diff)
Fix T73675: Leaving exit mode tags all objects for update
This is an oversight of a fix for T69834, where I didn't realize the ED_object_editmode_exit_ex() function is called for all objects as an opposite of only the ones which were in edit mode. Seems a simple fix: just move tag into a check that object was in the edit mode prior to tag. Differential Revision: https://developer.blender.org/D6808
-rw-r--r--source/blender/editors/object/object_edit.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index 098a4c65ae0..1c0ce423c4d 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -543,9 +543,9 @@ bool ED_object_editmode_exit_ex(Main *bmain, Scene *scene, Object *obedit, int f
* is flagged for editmode, without 'obedit' being set [#35489] */
if (UNLIKELY(obedit && obedit->mode & OB_MODE_EDIT)) {
obedit->mode &= ~OB_MODE_EDIT;
+ /* Also happens when mesh is shared across multiple objects. [#T69834] */
+ DEG_id_tag_update(&obedit->id, ID_RECALC_TRANSFORM | ID_RECALC_GEOMETRY);
}
- /* Also happens when mesh is shared across multiple objects. [#T69834] */
- DEG_id_tag_update(&obedit->id, ID_RECALC_TRANSFORM | ID_RECALC_GEOMETRY);
return true;
}