Revision: 42163
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42163
Author:   campbellbarton
Date:     2011-11-26 02:33:57 +0000 (Sat, 26 Nov 2011)
Log Message:
-----------
add null check, crashes py 3.3 which isn't released but adding the check is 
harmless

Modified Paths:
--------------
    trunk/blender/source/blender/python/intern/bpy_rna.c

Modified: trunk/blender/source/blender/python/intern/bpy_rna.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_rna.c        2011-11-25 
22:32:58 UTC (rev 42162)
+++ trunk/blender/source/blender/python/intern/bpy_rna.c        2011-11-26 
02:33:57 UTC (rev 42163)
@@ -6376,10 +6376,14 @@
        if ((order= PyDict_GetItem(class_dict, bpy_intern_str_order)) && 
PyList_CheckExact(order)) {
                for (pos= 0; pos<PyList_GET_SIZE(order); pos++) {
                        key= PyList_GET_ITEM(order, pos);
-                       item= PyDict_GetItem(class_dict, key);
-                       ret= deferred_register_prop(srna, key, item);
-                       if (ret != 0)
-                               break;
+                       /* however unlikely its possible
+                        * fails in py 3.3 beta with __qualname__ */
+                       if ((item= PyDict_GetItem(class_dict, key))) {
+                               ret= deferred_register_prop(srna, key, item);
+                               if (ret != 0) {
+                                       break;
+                               }
+                       }
                }
        }
        else {

_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to