[Bf-blender-cvs] [860a55d8fcc] master: Fix security popup re-displaying after undo

Campbell Barton noreply at git.blender.org
Thu Sep 16 08:57:52 CEST 2021


Commit: 860a55d8fccfb73e747e1dc302015e8347c2f0f0
Author: Campbell Barton
Date:   Thu Sep 16 16:52:28 2021 +1000
Branches: master
https://developer.blender.org/rB860a55d8fccfb73e747e1dc302015e8347c2f0f0

Fix security popup re-displaying after undo

Don't reset these flags when loading a file (or undoing)
rely on BPY_python_reset to reset the flags.

===================================================================

M	source/blender/blenkernel/BKE_global.h

===================================================================

diff --git a/source/blender/blenkernel/BKE_global.h b/source/blender/blenkernel/BKE_global.h
index 89713e9ad0a..7696b5c0189 100644
--- a/source/blender/blenkernel/BKE_global.h
+++ b/source/blender/blenkernel/BKE_global.h
@@ -124,7 +124,10 @@ enum {
 /** Don't overwrite these flags when reading a file. */
 #define G_FLAG_ALL_RUNTIME \
   (G_FLAG_SCRIPT_AUTOEXEC | G_FLAG_SCRIPT_OVERRIDE_PREF | G_FLAG_EVENT_SIMULATE | \
-   G_FLAG_USERPREF_NO_SAVE_ON_EXIT)
+   G_FLAG_USERPREF_NO_SAVE_ON_EXIT | \
+\
+   /* #BPY_python_reset is responsible for resetting these flags on file load. */ \
+   G_FLAG_SCRIPT_AUTOEXEC_FAIL | G_FLAG_SCRIPT_AUTOEXEC_FAIL_QUIET)
 
 /** Flags to read from blend file. */
 #define G_FLAG_ALL_READFILE 0



More information about the Bf-blender-cvs mailing list