[Bf-blender-cvs] [ef4877fde31] master: Fix error in fix for T66256, not clearing the exception

Campbell Barton noreply at git.blender.org
Thu Sep 17 13:15:11 CEST 2020


Commit: ef4877fde311f0638617cc6ff29cf64aedb4dab3
Author: Campbell Barton
Date:   Thu Sep 17 21:01:20 2020 +1000
Branches: master
https://developer.blender.org/rBef4877fde311f0638617cc6ff29cf64aedb4dab3

Fix error in fix for T66256, not clearing the exception

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

M	source/blender/python/intern/bpy_interface.c

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

diff --git a/source/blender/python/intern/bpy_interface.c b/source/blender/python/intern/bpy_interface.c
index ce2d9bca973..bc633daad27 100644
--- a/source/blender/python/intern/bpy_interface.c
+++ b/source/blender/python/intern/bpy_interface.c
@@ -195,7 +195,9 @@ void BPY_context_dict_clear_members_array(void **dict_p,
   PyObject *dict = *dict_p;
   BLI_assert(PyDict_Check(dict));
   for (uint i = 0; i < context_members_len; i++) {
-    PyDict_DelItemString(dict, context_members[i]);
+    if (PyDict_DelItemString(dict, context_members[i])) {
+      PyErr_Clear();
+    }
   }
 
   if (use_gil) {



More information about the Bf-blender-cvs mailing list