diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2019-01-24 18:11:53 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2019-01-24 18:15:20 +0300 |
| commit | c26fe3433ef369aaf68b890ca3356b29fde19ec8 (patch) | |
| tree | 31c0da7d91db0ba8f8578e755a7cdbf2f4c873fb | |
| parent | 3a527357a556491406ee9d33a79ab0af5f79e326 (diff) | |
Fix T59175: Compress file isn't working when Load UI is disabled.
Do not see why flags from loaded file should be skipped when we do not
load UI, this is not related to UI...
Think we can keep flags from file in both cases, should this raise some
other issue we'll just have to fine tune masked flags in each case
separately.
| -rw-r--r-- | source/blender/blenkernel/intern/blendfile.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/blendfile.c b/source/blender/blenkernel/intern/blendfile.c index c6cb8a412fe..747fc79fa54 100644 --- a/source/blender/blenkernel/intern/blendfile.c +++ b/source/blender/blenkernel/intern/blendfile.c @@ -249,9 +249,6 @@ static void setup_app_data( CTX_data_scene_set(C, curscene); } else { - /* Keep state from preferences. */ - const int fileflags_skip = G_FILE_FLAGS_RUNTIME; - G.fileflags = (G.fileflags & fileflags_skip) | (bfd->fileflags & ~fileflags_skip); CTX_wm_manager_set(C, bmain->wm.first); CTX_wm_screen_set(C, bfd->curscreen); CTX_data_scene_set(C, bfd->curscene); @@ -261,6 +258,10 @@ static void setup_app_data( curscene = bfd->curscene; } + /* Keep state from preferences. */ + const int fileflags_skip = G_FILE_FLAGS_RUNTIME; + G.fileflags = (G.fileflags & fileflags_skip) | (bfd->fileflags & ~fileflags_skip); + /* this can happen when active scene was lib-linked, and doesn't exist anymore */ if (CTX_data_scene(C) == NULL) { /* in case we don't even have a local scene, add one */ |