diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-02-21 05:40:48 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-02-21 05:40:48 +0300 |
| commit | d7bee4ce2c0583fc640c0909faa46bcef8cac59a (patch) | |
| tree | cfa42a4209be797c210596c17ecfea5a9c97924f /source/blender/windowmanager/intern/wm_files.c | |
| parent | 2ef296dc4c8808dbf0a81d4b4df198de66d41826 (diff) | |
bugfix [#26156] Opening .blend files through OS ignores "Load UI" flag
Diffstat (limited to 'source/blender/windowmanager/intern/wm_files.c')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_files.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c index b54e70a7640..4ad3b0d3249 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -257,6 +257,10 @@ static void wm_init_userdef(bContext *C) 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; |