Commit: 9e5c3a1fa9130b2fc8e1863fb3a763e69976efa2
Author: Campbell Barton
Date: Tue Jan 20 16:38:31 2015 +1100
Branches: master
https://developer.blender.org/rB9e5c3a1fa9130b2fc8e1863fb3a763e69976efa2
Fix for Trusted option, loading new file
Would use the setting of the previously loaded file, now re-initialize from
preferences.
===================================================================
M source/blender/windowmanager/intern/wm_files.c
===================================================================
diff --git a/source/blender/windowmanager/intern/wm_files.c
b/source/blender/windowmanager/intern/wm_files.c
index c1c31f6..9434075 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();
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
