diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-12-20 07:06:22 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-12-20 07:06:22 +0300 |
| commit | 3143b2f9424a10b1baf960c6a0bbb274cdeffe1d (patch) | |
| tree | 9d2095cc94207268aa0160a34db0eb27317e5af7 /source/blender/makesrna/intern/rna_rna.c | |
| parent | b3bcbc9e85aaad3c6262e8203c69d4089d5d8154 (diff) | |
| parent | 51f0c3fadf085b087a9f98a59db41af6aa632a57 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesrna/intern/rna_rna.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_rna.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_rna.c b/source/blender/makesrna/intern/rna_rna.c index da4eea41223..38149734bc2 100644 --- a/source/blender/makesrna/intern/rna_rna.c +++ b/source/blender/makesrna/intern/rna_rna.c @@ -337,7 +337,7 @@ static void rna_Struct_property_tags_begin(CollectionPropertyIterator *iter, Poi /* here ptr->data should always be the same as iter->parent.type */ StructRNA *srna = (StructRNA *)ptr->data; const EnumPropertyItem *tag_defines = RNA_struct_property_tag_defines(srna); - unsigned int tag_count = RNA_enum_items_count(tag_defines); + unsigned int tag_count = tag_defines ? RNA_enum_items_count(tag_defines) : 0; rna_iterator_array_begin(iter, (void *)tag_defines, sizeof(EnumPropertyItem), tag_count, 0, NULL); } |