griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: remove last G.main's in WM code of 2.8.

Browse Source 
Again, just validating ther usage and using G_MAIN instead.
This commit is contained in:
Bastien Montagne
2018-06-14 12:42:30 +02:00
parent 4bf751be70
commit 3eba5c0079
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/windowmanager/intern/wm_files.c
View File

@@ -227,7 +227,7 @@ static void wm_window_match_keep_current_wm(
for (wmWindow *win = wm->windows.first; win; win = win->next) {
WorkSpace *workspace;
BKE_workspace_layout_find_global(G.main, screen, &workspace);
BKE_workspace_layout_find_global(bmain, screen, &workspace);
BKE_workspace_active_set(win->workspace_hook, workspace);
win->scene = CTX_data_scene(C);

4
source/blender/windowmanager/intern/wm_window.c
View File

@@ -232,7 +232,7 @@ void wm_window_free(bContext *C, wmWindowManager *wm, wmWindow *win)
wm_ghostwindow_destroy(wm, win);
BKE_workspace_instance_hook_free(G.main, win->workspace_hook);
BKE_workspace_instance_hook_free(G_MAIN, win->workspace_hook);
MEM_freeN(win->stereo3d_format);
MEM_freeN(win);
@@ -1236,7 +1236,7 @@ void wm_window_reset_drawable(void)
{
BLI_assert(BLI_thread_is_main());
BLI_assert(GPU_framebuffer_current_get() == 0);
wmWindowManager *wm = G.main->wm.first;
wmWindowManager *wm = G_MAIN->wm.first;
if (wm == NULL)
return;

2
source/blender/windowmanager/manipulators/intern/wm_manipulator.c
View File

@@ -92,7 +92,7 @@ static wmManipulator *wm_manipulator_create(
IDPropertyTemplate val = {0};
mpr->properties = IDP_New(IDP_GROUP, &val, "wmManipulatorProperties");
}
RNA_pointer_create(G.main->wm.first, wt->srna, mpr->properties, mpr->ptr);
RNA_pointer_create(G_MAIN->wm.first, wt->srna, mpr->properties, mpr->ptr);
WM_manipulator_properties_sanitize(mpr->ptr, 0);