diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-03-02 12:01:49 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-03-02 12:01:49 +0300 |
| commit | e1f1567b5657190d2da2d4a8df49995e0e515d0c (patch) | |
| tree | 36609be0c429543c048bf5ee97e3fe9008acd8de /source/blender/editors/scene | |
| parent | 8153f89518b4a16852f3e3039e46bc06e82d1d23 (diff) | |
WorkSpace: ED_workspace_object_mode_in_other_window check other windows
The same workspace can have different active objects depending on the
window. So check other windows.
Diffstat (limited to 'source/blender/editors/scene')
| -rw-r--r-- | source/blender/editors/scene/scene_edit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/scene/scene_edit.c b/source/blender/editors/scene/scene_edit.c index 7cc86488a21..cee73c28767 100644 --- a/source/blender/editors/scene/scene_edit.c +++ b/source/blender/editors/scene/scene_edit.c @@ -135,7 +135,7 @@ void ED_scene_change_update( Object *obact_old = OBACT(layer_old); if (obact_old && (obact_new != obact_old)) { bool obact_old_is_active = - ED_workspace_object_mode_in_other_window(bmain->wm.first, workspace, obact_old, NULL); + ED_workspace_object_mode_in_other_window(bmain->wm.first, win, obact_old, NULL); if (obact_old && (obact_old_is_active == false)) { EvaluationContext eval_ctx; CTX_data_eval_ctx(C, &eval_ctx); @@ -162,7 +162,7 @@ void ED_scene_change_update( else { eObjectMode object_mode_set = OB_MODE_OBJECT; if (ED_workspace_object_mode_in_other_window( - bmain->wm.first, workspace, obact_new, &object_mode_set)) + bmain->wm.first, win, obact_new, &object_mode_set)) { workspace->object_mode = object_mode_set; } |