diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-03-01 13:07:09 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-03-01 13:33:06 +0300 |
commit | bcafdc82d83f70312859c9a045c92daa326afbdf (patch) | |
tree | a9112ab0cdb81548d756711ba2014ddbc539ee6b /source/blender/editors/screen/workspace_edit.c | |
parent | 7aed2de798b1e5f8663e8fe608a99f6c9f53c382 (diff) |
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.
Diffstat (limited to 'source/blender/editors/screen/workspace_edit.c')
-rw-r--r-- | source/blender/editors/screen/workspace_edit.c | 4 |
1 files changed, 3 insertions, 1 deletions
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; } } |