diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2015-02-12 19:30:19 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2015-02-12 19:30:19 +0300 |
| commit | d40ac45610edef50885ce73034f7c035f48cc9c1 (patch) | |
| tree | 9c576fa0f3bd9724c3a77a78e8ff09ea441f7e2c /source/creator | |
| parent | d70c7c06e76fe4309f3471d44a75e79f729e16b1 (diff) | |
Fix (unreported) `load_file()` func from creator.c not setting G.save_over correctly.
This was rather annoying, since if you were script-editing a .blend file in background
mode, opened through this commandline option system, and wanted to save over,
a mere `bpy.ops.wm.save_mainfile()` *would not* overwrite expected file,
but instead write/replace the dummy `untitled.blend` one!
Diffstat (limited to 'source/creator')
| -rw-r--r-- | source/creator/creator.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/source/creator/creator.c b/source/creator/creator.c index 15406485c7f..23a32af4dd0 100644 --- a/source/creator/creator.c +++ b/source/creator/creator.c @@ -1241,7 +1241,14 @@ static int load_file(int UNUSED(argc), const char **argv, void *data) CTX_wm_manager_set(C, NULL); /* remove wm to force check */ WM_check(C); - G.relbase_valid = 1; + if (bmain->name[0]) { + G.save_over = 1; + G.relbase_valid = 1; + } + else { + G.save_over = 0; + G.relbase_valid = 0; + } if (CTX_wm_manager(C) == NULL) CTX_wm_manager_set(C, wm); /* reset wm */ /* WM_file_read would call normally */ |