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/screen_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/screen_edit.c')
| -rw-r--r-- | source/blender/editors/screen/screen_edit.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c index 2aa48a15291..ec2cb641bcd 100644 --- a/source/blender/editors/screen/screen_edit.c +++ b/source/blender/editors/screen/screen_edit.c @@ -1399,6 +1399,7 @@ void ED_screen_full_restore(bContext *C, ScrArea *sa) */ ScrArea *ED_screen_state_toggle(bContext *C, wmWindow *win, ScrArea *sa, const short state) { + Main *bmain = CTX_data_main(C); wmWindowManager *wm = CTX_wm_manager(C); WorkSpace *workspace = WM_window_get_active_workspace(win); bScreen *sc, *oldscreen; @@ -1489,7 +1490,7 @@ ScrArea *ED_screen_state_toggle(bContext *C, wmWindow *win, ScrArea *sa, const s oldscreen->state = state; BLI_snprintf(newname, sizeof(newname), "%s-%s", oldscreen->id.name + 2, "nonnormal"); - layout_new = ED_workspace_layout_add(workspace, win, newname); + layout_new = ED_workspace_layout_add(bmain, workspace, win, newname); sc = BKE_workspace_layout_screen_get(layout_new); sc->state = state; |