Commit: d111f33008e578b23aa10d6ffe1787e9fcd4c4ee
Author: Campbell Barton
Date: Sat Mar 3 01:43:44 2018 +1100
Branches: blender2.8
https://developer.blender.org/rBd111f33008e578b23aa10d6ffe1787e9fcd4c4ee
WorkSpace: always change modes w/ the same active object
===================================================================
M source/blender/editors/screen/workspace_edit.c
===================================================================
diff --git a/source/blender/editors/screen/workspace_edit.c
b/source/blender/editors/screen/workspace_edit.c
index 864cbbf5b05..b8ec1c12eb6 100644
--- a/source/blender/editors/screen/workspace_edit.c
+++ b/source/blender/editors/screen/workspace_edit.c
@@ -212,7 +212,12 @@ bool ED_workspace_change(
if (use_object_mode) {
/* weak, set it back so it's used when activating
again. */
eObjectMode object_mode = workspace_old->object_mode;
-
ED_object_mode_generic_exit_or_other_window(&eval_ctx_old, bmain->wm.first,
workspace_old, scene, obact_old);
+ if (obact_old == obact_new) {
+ ED_object_mode_generic_exit(&eval_ctx_old,
workspace_old, scene, obact_old);
+ }
+ else {
+
ED_object_mode_generic_exit_or_other_window(&eval_ctx_old, bmain->wm.first,
workspace_old, scene, obact_old);
+ }
workspace_old->object_mode = object_mode;
ED_object_mode_generic_enter_or_other_window(C,
workspace_new->object_mode);
}
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
