diff options
Diffstat (limited to 'source/creator')
-rw-r--r-- | source/creator/creator_args.c | 6 | ||||
-rw-r--r-- | source/creator/creator_signals.c | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/source/creator/creator_args.c b/source/creator/creator_args.c index 657ea3f1eb3..da5dcf9ff8b 100644 --- a/source/creator/creator_args.c +++ b/source/creator/creator_args.c @@ -397,7 +397,7 @@ static void arg_py_context_restore( /* script may load a file, check old data is valid before using */ if (c_py->has_win) { if ((c_py->win == NULL) || - ((BLI_findindex(&G.main->wm, c_py->wm) != -1) && + ((BLI_findindex(&G_MAIN->wm, c_py->wm) != -1) && (BLI_findindex(&c_py->wm->windows, c_py->win) != -1))) { CTX_wm_window_set(C, c_py->win); @@ -405,7 +405,7 @@ static void arg_py_context_restore( } if ((c_py->scene == NULL) || - BLI_findindex(&G.main->scene, c_py->scene) != -1) + BLI_findindex(&G_MAIN->scene, c_py->scene) != -1) { CTX_data_scene_set(C, c_py->scene); } @@ -1774,7 +1774,7 @@ static int arg_handle_load_file(int UNUSED(argc), const char **argv, void *data) if (BLO_has_bfile_extension(filename)) { /* Just pretend a file was loaded, so the user can press Save and it'll save at the filename from the CLI. */ - BLI_strncpy(G.main->name, filename, FILE_MAX); + BLI_strncpy(G_MAIN->name, filename, FILE_MAX); G.relbase_valid = true; G.save_over = true; printf("... opened default scene instead; saving will write to: %s\n", filename); diff --git a/source/creator/creator_signals.c b/source/creator/creator_signals.c index 55f9777f55a..44c93d2c615 100644 --- a/source/creator/creator_signals.c +++ b/source/creator/creator_signals.c @@ -110,7 +110,7 @@ static void sig_handle_crash_backtrace(FILE *fp) static void sig_handle_crash(int signum) { - wmWindowManager *wm = G.main->wm.first; + wmWindowManager *wm = G_MAIN->wm.first; #ifdef USE_WRITE_CRASH_BLEND if (wm->undo_stack) { @@ -118,11 +118,11 @@ static void sig_handle_crash(int signum) if (memfile) { char fname[FILE_MAX]; - if (!G.main->name[0]) { + if (!G_MAIN->name[0]) { BLI_make_file_string("/", fname, BKE_tempdir_base(), "crash.blend"); } else { - BLI_strncpy(fname, G.main->name, sizeof(fname)); + BLI_strncpy(fname, G_MAIN->name, sizeof(fname)); BLI_replace_extension(fname, sizeof(fname), ".crash.blend"); } @@ -139,11 +139,11 @@ static void sig_handle_crash(int signum) char fname[FILE_MAX]; - if (!G.main->name[0]) { + if (!G_MAIN->name[0]) { BLI_join_dirfile(fname, sizeof(fname), BKE_tempdir_base(), "blender.crash.txt"); } else { - BLI_join_dirfile(fname, sizeof(fname), BKE_tempdir_base(), BLI_path_basename(G.main->name)); + BLI_join_dirfile(fname, sizeof(fname), BKE_tempdir_base(), BLI_path_basename(G_MAIN->name)); BLI_replace_extension(fname, sizeof(fname), ".crash.txt"); } |