diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-15 18:33:24 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-15 18:33:24 +0300 |
commit | 3e4bf31327c9264c735b85e565d817016db495fc (patch) | |
tree | 2f939558910ed5ebe304e0e686bb59a47e088112 /source/blender/editors/screen | |
parent | 5b6ae0523e18fbc94ba523e20f6c783cb8b3aa89 (diff) |
Cleanup: G.main removal from 2.8-only code.
Diffstat (limited to 'source/blender/editors/screen')
-rw-r--r-- | source/blender/editors/screen/screen_edit.c | 4 | ||||
-rw-r--r-- | source/blender/editors/screen/workspace_layout_edit.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c index ac4ab3461a3..4d7533d575c 100644 --- a/source/blender/editors/screen/screen_edit.c +++ b/source/blender/editors/screen/screen_edit.c @@ -832,13 +832,13 @@ void ED_screen_refresh(wmWindowManager *wm, wmWindow *win) } /* file read, set all screens, ... */ -void ED_screens_initialize(Main *UNUSED(bmain), wmWindowManager *wm) +void ED_screens_initialize(Main *bmain, wmWindowManager *wm) { wmWindow *win; for (win = wm->windows.first; win; win = win->next) { if (WM_window_get_active_workspace(win) == NULL) { - WM_window_set_active_workspace(win, G.main->workspaces.first); + WM_window_set_active_workspace(win, bmain->workspaces.first); } if (BLI_listbase_is_empty(&win->global_areas.areabase)) { diff --git a/source/blender/editors/screen/workspace_layout_edit.c b/source/blender/editors/screen/workspace_layout_edit.c index 0c7431cb2e7..6d504c05dd1 100644 --- a/source/blender/editors/screen/workspace_layout_edit.c +++ b/source/blender/editors/screen/workspace_layout_edit.c @@ -57,7 +57,7 @@ WorkSpaceLayout *ED_workspace_layout_add( WM_window_screen_rect_calc(win, &screen_rect); screen = screen_add(bmain, name, &screen_rect); - return BKE_workspace_layout_add(workspace, screen, name); + return BKE_workspace_layout_add(bmain, workspace, screen, name); } WorkSpaceLayout *ED_workspace_layout_duplicate( |