diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-15 18:43:18 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-15 18:43:18 +0300 |
commit | ecc57e7524bf04d498646715dcf4f9340ef3fc56 (patch) | |
tree | 220f951e1ff1be7bc769a1401845928f3f581330 /source/creator/creator_args.c | |
parent | 9c629b06bfdf645c009d953902c936b82900053a (diff) | |
parent | d645b1a78a752950d061a4ccb125721acade5544 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/creator/creator_args.c')
-rw-r--r-- | source/creator/creator_args.c | 6 |
1 files changed, 3 insertions, 3 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); |