kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix for Trusted option, loading new file

Browse Source 
Would use the setting of the previously loaded file, now re-initialize from preferences.
This commit is contained in:
Campbell Barton 2015-01-20 16:38:31 +11:00
parent 1d56f456f7
commit 9e5c3a1fa9
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/windowmanager/intern/wm_files.c
View File

@ -561,6 +561,10 @@ int wm_homefile_read(bContext *C, ReportList *reports, bool from_memory, const c
/* options exclude eachother */ /* options exclude eachother */
BLI_assert((from_memory && custom_file) == 0); 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); BLI_callback_exec(CTX_data_main(C), NULL, BLI_CB_EVT_LOAD_PRE);
UI_view2d_zoom_cache_reset(); UI_view2d_zoom_cache_reset();