[Bf-blender-cvs] [7446c761877] master: Fix T59175: Compress file isn't working when Load UI is disabled.

[Bastien Montagne]

Commit: 7446c76187778171a5f0e2949581c1b3e6918954
Author: Bastien Montagne
Date:   Thu Jan 24 16:11:53 2019 +0100
Branches: master
https://developer.blender.org/rB7446c76187778171a5f0e2949581c1b3e6918954

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.

===================================================================

M	source/blender/blenkernel/intern/blendfile.c

===================================================================

diff --git a/source/blender/blenkernel/intern/blendfile.c b/source/blender/blenkernel/intern/blendfile.c
index a8809de0431..4f501f6fbf2 100644
--- a/source/blender/blenkernel/intern/blendfile.c
+++ b/source/blender/blenkernel/intern/blendfile.c
@@ -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);