From 625101da9942e301e996f00fc498e26cefe713eb Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 24 Feb 2015 19:41:48 +1100 Subject: [PATCH] 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. --- source/blender/makesrna/intern/rna_rna.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) ||