[Bf-blender-cvs] [a2f183fa7d3] temp-object-multi-mode: Fix exiting edit-mode which failed to leave editmode for non-active objects
Campbell Barton
noreply at git.blender.org
Tue Apr 10 20:21:52 CEST 2018
Commit: a2f183fa7d324cf518595e276ef3398a6f2d790f
Author: Campbell Barton
Date: Tue Apr 10 20:21:19 2018 +0200
Branches: temp-object-multi-mode
https://developer.blender.org/rBa2f183fa7d324cf518595e276ef3398a6f2d790f
Fix exiting edit-mode which failed to leave editmode for non-active objects
===================================================================
M source/blender/editors/object/object_edit.c
===================================================================
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index ae821db3b7c..77c16887528 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -482,6 +482,17 @@ static int editmode_toggle_exec(bContext *C, wmOperator *op)
}
else {
ED_object_editmode_exit(C, EM_FREEDATA | EM_WAITCURSOR); /* had EM_DO_UNDO but op flag calls undo too [#24685] */
+ if ((obact->mode & mode_flag) == 0) {
+ FOREACH_SELECTED_OBJECT_BEGIN(view_layer, ob)
+ {
+ if (ob != obact) {
+ if (ob->flag & SELECT) {
+ ED_object_editmode_exit_ex(NULL, scene, ob, EM_FREEDATA | EM_WAITCURSOR);
+ }
+ }
+ }
+ FOREACH_SELECTED_OBJECT_END;
+ }
}
ED_space_image_uv_sculpt_update(CTX_wm_manager(C), scene);
More information about the Bf-blender-cvs
mailing list