diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-11-25 10:55:33 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-11-25 10:55:33 +0400 |
| commit | 33767bde9b3a5665514583321f3e8d9175bd5064 (patch) | |
| tree | 7c251cac9bbe5998c83f4e588c1dbdef21edc654 /source/blender/makesrna | |
| parent | 6c2e338f103d17a1ce339c6897926a417e624728 (diff) | |
Fix #33297: crash loading modal keymap after recent keymap bugfix.
Diffstat (limited to 'source/blender/makesrna')
| -rw-r--r-- | source/blender/makesrna/intern/rna_access.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c index 5955eca3f09..65b8131ef56 100644 --- a/source/blender/makesrna/intern/rna_access.c +++ b/source/blender/makesrna/intern/rna_access.c @@ -5954,7 +5954,11 @@ int RNA_struct_equals(PointerRNA *a, PointerRNA *b) 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); |