diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-06 17:32:09 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-06 17:32:09 +0300 |
commit | 0ee478567570d4bb85b39d043b800a11694ffe5e (patch) | |
tree | b562803dfe57bac71d308a116a3fdb892b443760 /source/blender/editors/screen/workspace_layout_edit.c | |
parent | bb7202495a289370fe39a9aaeebf8d21fa7d357c (diff) |
Cleanup: get rid of just-added G.main usage.
Was just added to ease merging of master, proper code now!
Diffstat (limited to 'source/blender/editors/screen/workspace_layout_edit.c')
-rw-r--r-- | source/blender/editors/screen/workspace_layout_edit.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/editors/screen/workspace_layout_edit.c b/source/blender/editors/screen/workspace_layout_edit.c index 4cb88b7f9a0..0c7431cb2e7 100644 --- a/source/blender/editors/screen/workspace_layout_edit.c +++ b/source/blender/editors/screen/workspace_layout_edit.c @@ -46,6 +46,7 @@ * Empty screen, with 1 dummy area without spacedata. Uses window size. */ WorkSpaceLayout *ED_workspace_layout_add( + Main *bmain, WorkSpace *workspace, wmWindow *win, const char *name) @@ -54,12 +55,13 @@ WorkSpaceLayout *ED_workspace_layout_add( rcti screen_rect; WM_window_screen_rect_calc(win, &screen_rect); - screen = screen_add(G.main, name, &screen_rect); + screen = screen_add(bmain, name, &screen_rect); return BKE_workspace_layout_add(workspace, screen, name); } WorkSpaceLayout *ED_workspace_layout_duplicate( + Main *bmain, WorkSpace *workspace, const WorkSpaceLayout *layout_old, wmWindow *win) { @@ -72,7 +74,7 @@ WorkSpaceLayout *ED_workspace_layout_duplicate( return NULL; /* XXX handle this case! */ } - layout_new = ED_workspace_layout_add(workspace, win, name); + layout_new = ED_workspace_layout_add(bmain, workspace, win, name); screen_new = BKE_workspace_layout_screen_get(layout_new); screen_data_copy(screen_new, screen_old); |