diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-15 18:36:44 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-15 18:36:44 +0300 |
commit | 49915e3241839045f8e688edab1ce314edc465f4 (patch) | |
tree | d2c37cf58ec91f5203129ec7e0fef0fc6fd59fae /source/creator/creator_args.c | |
parent | da9b1b14ed0ffd29fcff8f4ca64fff5f034532fc (diff) |
Cleanup: validate G.main's in creator code.
Using G_MAIN here is valid!
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 4f2185cae96..98147e45c4e 100644 --- a/source/creator/creator_args.c +++ b/source/creator/creator_args.c @@ -404,7 +404,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); @@ -412,7 +412,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); } @@ -1914,7 +1914,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); |