diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-13 11:57:10 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-13 11:57:10 +0300 |
| commit | 67e8c1e1c7cfbb000de903c9c4e83874adba411f (patch) | |
| tree | 79af3eb08fcb3f422e212ff88c3be2bc4eae4561 /source/blender/blenkernel/intern/blendfile.c | |
| parent | 27882024176a3015e36305d19a763571e1a8c731 (diff) | |
Cleanup: remove more G.main from BKE area.
Diffstat (limited to 'source/blender/blenkernel/intern/blendfile.c')
| -rw-r--r-- | source/blender/blenkernel/intern/blendfile.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/blendfile.c b/source/blender/blenkernel/intern/blendfile.c index 935000e3b8e..aa5530704c6 100644 --- a/source/blender/blenkernel/intern/blendfile.c +++ b/source/blender/blenkernel/intern/blendfile.c @@ -113,7 +113,7 @@ static void setup_app_data( bContext *C, BlendFileData *bfd, const char *filepath, ReportList *reports) { - Main *bmain = G.main; /* Valid usage */ + Main *bmain = G_MAIN; Scene *curscene = NULL; const bool is_startup = (bfd->filename[0] == '\0'); const bool recover = (G.fileflags & G_FILE_RECOVER) != 0; @@ -198,7 +198,7 @@ static void setup_app_data( } } - /* BKE_blender_globals_clear will free G.main, here we can still restore pointers */ + /* BKE_blender_globals_clear will free G_MAIN, here we can still restore pointers */ blo_lib_link_screen_restore(bfd->main, curscreen, curscene); /* curscreen might not be set when loading without ui (see T44217) so only re-assign if available */ if (curscreen) { @@ -215,14 +215,14 @@ static void setup_app_data( } } - /* free G.main Main database */ + /* free G_MAIN Main database */ // CTX_wm_manager_set(C, NULL); BKE_blender_globals_clear(); /* clear old property update cache, in case some old references are left dangling */ RNA_property_update_cache_free(); - bmain = G.main = bfd->main; + bmain = G_MAIN = bfd->main; CTX_data_main_set(C, bmain); |