diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-09-24 04:39:01 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-09-24 04:39:01 +0400 |
commit | 05f8e53d3361f1f043f7dcf520671d3fa3a79e32 (patch) | |
tree | eff6b4f5028472557f85b29f72c9957a8a620566 /source/blender/makesrna/intern/makesrna.c | |
parent | 3921f0528cc73d64e11da095903c961b1969b46e (diff) |
bugfix [#23965] Segmentation fault when using bpy_struct.keyframe_insert() with nested custom property
Diffstat (limited to 'source/blender/makesrna/intern/makesrna.c')
-rw-r--r-- | source/blender/makesrna/intern/makesrna.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/makesrna/intern/makesrna.c b/source/blender/makesrna/intern/makesrna.c index 8a68c460573..38a5b2587ff 100644 --- a/source/blender/makesrna/intern/makesrna.c +++ b/source/blender/makesrna/intern/makesrna.c @@ -395,7 +395,7 @@ static char *rna_def_property_get_func(FILE *f, StructRNA *srna, PropertyRNA *pr { char *func; - if(prop->flag & PROP_IDPROPERTY) + if(prop->flag & PROP_IDPROPERTY && manualfunc==NULL) return NULL; if(!manualfunc) { @@ -576,7 +576,7 @@ static char *rna_def_property_set_func(FILE *f, StructRNA *srna, PropertyRNA *pr if(!(prop->flag & PROP_EDITABLE)) return NULL; - if(prop->flag & PROP_IDPROPERTY) + if(prop->flag & PROP_IDPROPERTY && manualfunc==NULL) return NULL; if(!manualfunc) { @@ -744,7 +744,7 @@ static char *rna_def_property_length_func(FILE *f, StructRNA *srna, PropertyRNA { char *func= NULL; - if(prop->flag & PROP_IDPROPERTY) + if(prop->flag & PROP_IDPROPERTY && manualfunc==NULL) return NULL; if(prop->type == PROP_STRING) { @@ -802,7 +802,7 @@ static char *rna_def_property_begin_func(FILE *f, StructRNA *srna, PropertyRNA * { char *func, *getfunc; - if(prop->flag & PROP_IDPROPERTY) + if(prop->flag & PROP_IDPROPERTY && manualfunc==NULL) return NULL; if(!manualfunc) { @@ -860,7 +860,7 @@ static char *rna_def_property_lookup_int_func(FILE *f, StructRNA *srna, Property { char *func; - if(prop->flag & PROP_IDPROPERTY) + if(prop->flag & PROP_IDPROPERTY && manualfunc==NULL) return NULL; if(!manualfunc) { @@ -952,7 +952,7 @@ static char *rna_def_property_next_func(FILE *f, StructRNA *srna, PropertyRNA *p { char *func, *getfunc; - if(prop->flag & PROP_IDPROPERTY) + if(prop->flag & PROP_IDPROPERTY && manualfunc==NULL) return NULL; if(!manualfunc) @@ -978,7 +978,7 @@ static char *rna_def_property_end_func(FILE *f, StructRNA *srna, PropertyRNA *pr { char *func; - if(prop->flag & PROP_IDPROPERTY) + if(prop->flag & PROP_IDPROPERTY && manualfunc==NULL) return NULL; func= rna_alloc_function_name(srna->identifier, prop->identifier, "end"); |