blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

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.
This commit is contained in:
Bastien Montagne 2019-01-24 16:11:53 +01:00
parent 3a527357a5
commit c26fe3433e
Notes: blender-bot 2023-02-14 10:37:50 +01:00 
Referenced by issue #59175, Compress file isn't working when Load UI is disabled
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/blenkernel/intern/blendfile.c
View File

@ -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 */