kanarip / rpms / blender

Forked from rpms/blender 5 years ago
Clone
5f5d6c2
diff -r -U3 blender-2.79b-orig/source/blender/python/intern/bpy_rna.c blender-2.79b/source/blender/python/intern/bpy_rna.c
5f5d6c2
--- blender-2.79b-orig/source/blender/python/intern/bpy_rna.c	2018-03-23 16:22:25.000000000 +0100
5f5d6c2
+++ blender-2.79b/source/blender/python/intern/bpy_rna.c	2018-11-02 14:15:34.311361383 +0100
5f5d6c2
@@ -7389,6 +7389,7 @@
5f5d6c2
 		item = PyObject_GetAttrString(py_class, identifier);
5f5d6c2
 
5f5d6c2
 		if (item == NULL) {
5f5d6c2
+			PyErr_Clear();
5f5d6c2
 			/* Sneaky workaround to use the class name as the bl_idname */
5f5d6c2
 
5f5d6c2
 #define     BPY_REPLACEMENT_STRING(rna_attr, py_attr)                         \
5f5d6c2
@@ -7418,8 +7419,9 @@
5f5d6c2
 				             class_type, py_class_name, identifier);
5f5d6c2
 				return -1;
5f5d6c2
 			}
5f5d6c2
-
5f5d6c2
-			PyErr_Clear();
5f5d6c2
+			else {
5f5d6c2
+				PyErr_Clear();
5f5d6c2
+			}
5f5d6c2
 		}
5f5d6c2
 		else {
5f5d6c2
 			if (pyrna_py_to_prop(dummyptr, prop, NULL, item, "validating class:") != 0) {