diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-01-20 08:38:31 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-01-20 08:38:31 +0300 |
| commit | 9e5c3a1fa9130b2fc8e1863fb3a763e69976efa2 (patch) | |
| tree | 84ed5c955f222fc3b7f2089385efd38c8d4a0b24 /source/blender/windowmanager/intern/wm_files.c | |
| parent | 1d56f456f7854c9611bc8b03d77010775ab8fdcb (diff) | |
Fix for Trusted option, loading new file
Would use the setting of the previously loaded file, now re-initialize from preferences.
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 c1c31f6795d..94340759416 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -561,6 +561,10 @@ int wm_homefile_read(bContext *C, ReportList *reports, bool from_memory, const c /* options exclude eachother */ BLI_assert((from_memory && custom_file) == 0); + if ((G.f & G_SCRIPT_OVERRIDE_PREF) == 0) { + BKE_BIT_TEST_SET(G.f, (U.flag & USER_SCRIPT_AUTOEXEC_DISABLE) == 0, G_SCRIPT_AUTOEXEC); + } + BLI_callback_exec(CTX_data_main(C), NULL, BLI_CB_EVT_LOAD_PRE); UI_view2d_zoom_cache_reset(); |