diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-07-24 12:21:32 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-07-24 12:27:05 +0300 |
| commit | c4803759a260853ca516dbdc9028bd0077056114 (patch) | |
| tree | 4d5f213101b9cb1bbd9e5b5827c872b94b977580 /source/blender/windowmanager/intern/wm_window.c | |
| parent | 31c49493d14a68d4f7bf35162c6b16765d1433a0 (diff) | |
Fix T55245: undo with multiple windows and view layers not working correct.
Diffstat (limited to 'source/blender/windowmanager/intern/wm_window.c')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_window.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c index 4b26532742b..dd4013efdf2 100644 --- a/source/blender/windowmanager/intern/wm_window.c +++ b/source/blender/windowmanager/intern/wm_window.c @@ -2167,7 +2167,12 @@ ViewLayer *WM_window_get_active_view_layer(const wmWindow *win) return view_layer; } - return BKE_view_layer_default_view(scene); + view_layer = BKE_view_layer_default_view(scene); + if (view_layer) { + WM_window_set_active_view_layer((wmWindow*)win, view_layer); + } + + return view_layer; } void WM_window_set_active_view_layer(wmWindow *win, ViewLayer *view_layer) |