diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-22 13:50:26 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-22 13:50:26 +0300 |
| commit | 88158e4116a0108e68b59ffc5987104fa857a130 (patch) | |
| tree | 06404ce907cf3c86f4eb22b6f9d336722afeafce /source/blender/makesrna/intern/rna_screen.c | |
| parent | 646412004b1da5d6b7b831a5a49022d1fd138e0b (diff) | |
Cleanup: 2.8-new G.main in RNA code.
Again, essentially validating them, and adding assert check if needed.
Diffstat (limited to 'source/blender/makesrna/intern/rna_screen.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_screen.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/makesrna/intern/rna_screen.c b/source/blender/makesrna/intern/rna_screen.c index e2d9b833a4d..2a16d2a41ee 100644 --- a/source/blender/makesrna/intern/rna_screen.c +++ b/source/blender/makesrna/intern/rna_screen.c @@ -82,7 +82,7 @@ static void rna_Screen_redraw_update(Main *UNUSED(bmain), Scene *UNUSED(scene), static int rna_Screen_is_animation_playing_get(PointerRNA *UNUSED(ptr)) { /* can be NULL on file load, T42619 */ - wmWindowManager *wm = G.main->wm.first; + wmWindowManager *wm = G_MAIN->wm.first; return wm ? (ED_screen_animation_playing(wm) != NULL) : 0; } @@ -95,7 +95,7 @@ static int rna_region_alignment_get(PointerRNA *ptr) static void rna_Screen_layout_name_get(PointerRNA *ptr, char *value) { const bScreen *screen = ptr->data; - const WorkSpaceLayout *layout = BKE_workspace_layout_find_global(G.main, screen, NULL); + const WorkSpaceLayout *layout = BKE_workspace_layout_find_global(G_MAIN, screen, NULL); if (layout) { const char *name = BKE_workspace_layout_name_get(layout); @@ -109,7 +109,7 @@ static void rna_Screen_layout_name_get(PointerRNA *ptr, char *value) static int rna_Screen_layout_name_length(PointerRNA *ptr) { const bScreen *screen = ptr->data; - const WorkSpaceLayout *layout = BKE_workspace_layout_find_global(G.main, screen, NULL); + const WorkSpaceLayout *layout = BKE_workspace_layout_find_global(G_MAIN, screen, NULL); if (layout) { const char *name = BKE_workspace_layout_name_get(layout); |