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:
parent
8be7ed1408
commit
7446c76187
Notes:
blender-bot
2023-04-14 09:18:04 +02:00
Referenced by issue #59175, Compress file isn't working when Load UI is disabled
|
@ -265,9 +265,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);
|
||||
|
@ -277,6 +274,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) {
|
||||
wmWindow *win = CTX_wm_window(C);
|
||||
|
|
Loading…
Reference in New Issue