[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35010] trunk/blender/source/blender: bugfix [#26156] Opening .blend files through OS ignores "Load UI" flag

[Campbell Barton]

Revision: 35010
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35010
Author:   campbellbarton
Date:     2011-02-21 02:40:48 +0000 (Mon, 21 Feb 2011)
Log Message:
-----------
bugfix [#26156] Opening .blend files through OS ignores "Load UI" flag

Modified Paths:
--------------
    trunk/blender/source/blender/editors/render/render_preview.c
    trunk/blender/source/blender/windowmanager/intern/wm_files.c

Modified: trunk/blender/source/blender/editors/render/render_preview.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_preview.c	2011-02-21 02:07:26 UTC (rev 35009)
+++ trunk/blender/source/blender/editors/render/render_preview.c	2011-02-21 02:40:48 UTC (rev 35010)
@@ -287,6 +287,7 @@
 	BlendFileData *bfd;
 	extern int datatoc_preview_blend_size;
 	extern char datatoc_preview_blend[];
+	const int fileflags= G.fileflags;
 	
 	G.fileflags |= G_FILE_NO_UI;
 	bfd= BLO_read_from_memory(datatoc_preview_blend, datatoc_preview_blend_size, NULL);
@@ -295,7 +296,7 @@
 		
 		MEM_freeN(bfd);
 	}
-	G.fileflags &= ~G_FILE_NO_UI;
+	G.fileflags= fileflags;
 }
 
 void ED_preview_free_dbase(void)

Modified: trunk/blender/source/blender/windowmanager/intern/wm_files.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_files.c	2011-02-21 02:07:26 UTC (rev 35009)
+++ trunk/blender/source/blender/windowmanager/intern/wm_files.c	2011-02-21 02:40:48 UTC (rev 35010)
@@ -257,6 +257,10 @@
 	MEM_CacheLimiter_set_maximum(U.memcachelimit * 1024 * 1024);
 	sound_init(CTX_data_main(C));
 
+	/* needed so loading a file from the command line respects user-pref [#26156] */
+	if(U.flag & USER_FILENOUI)	G.fileflags |= G_FILE_NO_UI;
+	else						G.fileflags &= ~G_FILE_NO_UI;
+
 	/* set the python auto-execute setting from user prefs */
 	/* disabled by default, unless explicitly enabled in the command line */
 	if ((U.flag & USER_SCRIPT_AUTOEXEC_DISABLE) == 0) G.f |=  G_SCRIPT_AUTOEXEC;