Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2015-02-24 11:41:48 +0300
committerCampbell Barton <ideasman42@gmail.com>2015-02-24 11:45:56 +0300
commit625101da9942e301e996f00fc498e26cefe713eb (patch)
treeb4515d9d80507184072f326e78f912c7e9f8fec2 /source/blender/makesrna/intern/rna_rna.c
parenta585cbd2af92c0a1ebf24c1a28069bb4ebf1d177 (diff)
RNA: correct enum flag callback
Was returning NULL, auto-completing: bpy.types.Material.bl_rna.properties["type"]. Would crash, accessing 'default_flag', thanks to @lukastoenne for investigating.
Diffstat (limited to 'source/blender/makesrna/intern/rna_rna.c')
-rw-r--r--source/blender/makesrna/intern/rna_rna.c2
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 3a5c2fe2847..42e231fa76f 100644
--- a/source/blender/makesrna/intern/rna_rna.c
+++ b/source/blender/makesrna/intern/rna_rna.c
@@ -813,7 +813,7 @@ static EnumPropertyItem *rna_EnumProperty_default_itemf(bContext *C, PointerRNA
/* incompatible default attributes */
if ((prop_parent->flag & PROP_ENUM_FLAG) != (prop->flag & PROP_ENUM_FLAG)) {
- return NULL;
+ return DummyRNA_NULL_items;
}
if ((eprop->itemf == NULL) ||