Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2017-03-27 05:02:41 +0300
committerCampbell Barton <ideasman42@gmail.com>2017-03-27 05:02:41 +0300
commit086320a62e108b6e640f2b2453b8f1f0a946e57b (patch)
treeaeedf695e527a9b1bd89e59e0c8b4606a24cf877 /source/blender/blenloader/intern/versioning_defaults.c
parent356aacab6b3667843fff7986cbd4026f70345d41 (diff)
CMake: WITH_PYTHON_SECURITY=OFF was ignored
Allow auto-execution to be enabled, also move this to user-prefs versioning code.
Diffstat (limited to 'source/blender/blenloader/intern/versioning_defaults.c')
-rw-r--r--source/blender/blenloader/intern/versioning_defaults.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/source/blender/blenloader/intern/versioning_defaults.c b/source/blender/blenloader/intern/versioning_defaults.c
index 6145b90b406..e34f12b1cf9 100644
--- a/source/blender/blenloader/intern/versioning_defaults.c
+++ b/source/blender/blenloader/intern/versioning_defaults.c
@@ -72,6 +72,14 @@ void BLO_update_defaults_userpref_blend(void)
/* default so DPI is detected automatically */
U.dpi = 0;
U.ui_scale = 1.0f;
+
+#ifdef WITH_PYTHON_SECURITY
+ /* use alternative setting for security nuts
+ * otherwise we'd need to patch the binary blob - startup.blend.c */
+ U.flag |= USER_SCRIPT_AUTOEXEC_DISABLE;
+#else
+ U.flag &= ~USER_SCRIPT_AUTOEXEC_DISABLE;
+#endif
}
/**