diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-04-03 17:13:13 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-04-03 17:13:13 +0300 |
commit | 6744c34a263798c54a6e1afb699039dc4fac6163 (patch) | |
tree | 1a6ed5579b64886eb77ae1beb1c724294d9b3346 /source/blender/makesrna/intern/rna_rna.c | |
parent | 7e9a80530fad5bf577eebd2e7ffb1f1aa1b523da (diff) | |
parent | 96f565b380a8552e91151b9879746a1992283a35 (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 0452c644052..a46c8e2f18f 100644 --- a/source/blender/makesrna/intern/rna_rna.c +++ b/source/blender/makesrna/intern/rna_rna.c @@ -638,7 +638,7 @@ static const EnumPropertyItem *rna_Property_tags_itemf( int totitem = 0; for (const EnumPropertyItem *struct_tags = RNA_struct_property_tag_defines(srna); - struct_tags->identifier; + struct_tags != NULL && struct_tags->identifier != NULL; struct_tags++) { memcpy(&tmp, struct_tags, sizeof(tmp)); |