[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52537] trunk/blender/source/blender/ makesrna/intern/rna_access.c: Fix #33297: crash loading modal keymap after recent keymap bugfix.

[Brecht Van Lommel]

Revision: 52537
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52537
Author:   blendix
Date:     2012-11-25 06:55:33 +0000 (Sun, 25 Nov 2012)
Log Message:
-----------
Fix #33297: crash loading modal keymap after recent keymap bugfix.

Modified Paths:
--------------
    trunk/blender/source/blender/makesrna/intern/rna_access.c

Modified: trunk/blender/source/blender/makesrna/intern/rna_access.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_access.c   2012-11-24 
20:54:14 UTC (rev 52536)
+++ trunk/blender/source/blender/makesrna/intern/rna_access.c   2012-11-25 
06:55:33 UTC (rev 52537)
@@ -5954,8 +5954,12 @@
        PropertyRNA *iterprop;
        int equals = 1;
 
-       if (a->type != b->type)
+       if (a == NULL && b == NULL)
+               return 1;
+       else if (a == NULL || b == NULL)
                return 0;
+       else if (a->type != b->type)
+               return 0;
 
        iterprop = RNA_struct_iterator_property(a->type);
        citerprop = (CollectionPropertyRNA *)rna_ensure_property(iterprop);

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs