diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-10-14 23:19:43 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-10-14 23:19:43 +0400 |
| commit | 991e67ddc756cdbf6e85b9a0520792d1f48026e4 (patch) | |
| tree | ca930274523e3355cfda68939b45525c1bed93d0 /source/blender/makesrna/intern/rna_rna.c | |
| parent | 96d2dc7d090975687e5b99495fcc1e5725e75120 (diff) | |
RNA:
* Enums with an _itemf callback now never get context NULL passed in,
rather a fixed list of enum items are defined which should contain
all items (if possible), from which the _itemf callback can then use
a subset.
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 fbb24f9ada9..31aecbb8a76 100644 --- a/source/blender/makesrna/intern/rna_rna.c +++ b/source/blender/makesrna/intern/rna_rna.c @@ -624,7 +624,7 @@ static EnumPropertyItem *rna_EnumProperty_default_itemf(bContext *C, PointerRNA rna_idproperty_check(&prop, ptr); eprop= (EnumPropertyRNA*)prop; - if(eprop->itemf==NULL || eprop->itemf==rna_EnumProperty_default_itemf) + if(eprop->itemf==NULL || eprop->itemf==rna_EnumProperty_default_itemf || !C) return eprop->item; return eprop->itemf(C, ptr, free); |