From bcafdc82d83f70312859c9a045c92daa326afbdf Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 1 Mar 2018 21:07:09 +1100 Subject: WorkSpace: fix mode exiting w/ multi-window Activating an object exited modes for all other objects in the layer. Now check these objects aren't active in other windows first. --- source/blender/editors/screen/workspace_edit.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to '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 839b7468d4b..59e24632892 100644 --- a/source/blender/editors/screen/workspace_edit.c +++ b/source/blender/editors/screen/workspace_edit.c @@ -352,7 +352,9 @@ bool ED_workspace_object_mode_in_other_window( ViewLayer *view_layer_iter = BKE_view_layer_from_workspace_get(scene_iter, workspace_iter); Object *obact_iter = OBACT(view_layer_iter); if (obact == obact_iter) { - *r_object_mode = workspace_iter->object_mode; + if (r_object_mode) { + *r_object_mode = workspace_iter->object_mode; + } return true; } } -- cgit v1.2.3