tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

Cleanup: G.main removal from 2.8-only code.

This commit is contained in:
Bastien Montagne 2018-06-15 17:33:24 +02:00
parent 5b6ae0523e
commit 3e4bf31327
6 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/blenkernel/BKE_workspace.h
View File

@ -44,6 +44,7 @@ struct WorkSpaceInstanceHook *BKE_workspace_instance_hook_create(const struct Ma
void BKE_workspace_instance_hook_free(const struct Main *bmain, struct WorkSpaceInstanceHook *hook);
struct WorkSpaceLayout *BKE_workspace_layout_add(
struct Main *bmain,
struct WorkSpace *workspace,
struct bScreen *screen,
const char *name) ATTR_NONNULL();

3
source/blender/blenkernel/intern/workspace.c
View File

@ -227,13 +227,14 @@ void BKE_workspace_instance_hook_free(const Main *bmain, WorkSpaceInstanceHook *
* Add a new layout to \a workspace for \a screen.
*/
WorkSpaceLayout *BKE_workspace_layout_add(
Main *bmain,
WorkSpace *workspace,
bScreen *screen,
const char *name)
{
WorkSpaceLayout *layout = MEM_callocN(sizeof(*layout), __func__);
BLI_assert(!workspaces_is_screen_used(G.main, screen));
BLI_assert(!workspaces_is_screen_used(bmain, screen));
layout->screen = screen;
workspace_layout_name_set(workspace, layout, name);
BLI_addtail(&workspace->layouts, layout);

2
source/blender/blenloader/intern/versioning_280.c
View File

@ -114,7 +114,7 @@ static void do_version_workspaces_create_from_screens(Main *bmain)
else {
workspace = BKE_workspace_add(bmain, screen->id.name + 2);
}
BKE_workspace_layout_add(workspace, screen, screen->id.name + 2);
BKE_workspace_layout_add(bmain, workspace, screen, screen->id.name + 2);
BKE_workspace_view_layer_set(workspace, layer, scene);
}
}

4
source/blender/editors/screen/screen_edit.c
View File

@ -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)) {

2
source/blender/editors/screen/workspace_layout_edit.c
View File

@ -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(

4
source/blender/editors/sculpt_paint/sculpt.c
View File

@ -5737,7 +5737,7 @@ void ED_object_sculptmode_enter_ex(
}
}
// ED_workspace_object_mode_sync_from_object(G.main->wm.first, workspace, ob);
// ED_workspace_object_mode_sync_from_object(bmain->wm.first, workspace, ob);
/* Flush object mode. */
DEG_id_tag_update(&ob->id, DEG_TAG_COPY_ON_WRITE);
@ -5789,7 +5789,7 @@ void ED_object_sculptmode_exit_ex(
/* Leave sculptmode */
ob->mode &= ~mode_flag;
// ED_workspace_object_mode_sync_from_object(G.main->wm.first, workspace, ob);
// ED_workspace_object_mode_sync_from_object(G_MAIN->wm.first, workspace, ob);
BKE_sculptsession_free(ob);