diff options
| author | Arystanbek Dyussenov <arystan.d@gmail.com> | 2009-07-16 13:09:38 +0400 |
|---|---|---|
| committer | Arystanbek Dyussenov <arystan.d@gmail.com> | 2009-07-16 13:09:38 +0400 |
| commit | d381a668be8cda3e38bc16d162fce74a15acc39d (patch) | |
| tree | f988527755d803f0059d2f967d86b7aa2697fdb4 /source/blender/makesrna/intern/rna_internal.h | |
| parent | 73ad2d320cca8c34d7901630dd8c6223ba4cd4a3 (diff) | |
| parent | 88e3e8c1c939ee25f9d86fcfb1d55c0ab415373e (diff) | |
Merge with 2.5 -r 21515:21619.
Diffstat (limited to 'source/blender/makesrna/intern/rna_internal.h')
| -rw-r--r-- | source/blender/makesrna/intern/rna_internal.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/makesrna/intern/rna_internal.h b/source/blender/makesrna/intern/rna_internal.h index 219cc9ccd59..50448e89ef7 100644 --- a/source/blender/makesrna/intern/rna_internal.h +++ b/source/blender/makesrna/intern/rna_internal.h @@ -169,7 +169,7 @@ void RNA_def_world(struct BlenderRNA *brna); void rna_def_animdata_common(struct StructRNA *srna); void rna_def_texmat_common(struct StructRNA *srna, const char *texspace_editable); -void rna_def_mtex_common(struct StructRNA *srna, const char *begin, const char *activeget, const char *structname); +void rna_def_mtex_common(struct StructRNA *srna, const char *begin, const char *activeget, const char *activeset, const char *structname); void rna_ID_name_get(struct PointerRNA *ptr, char *value); int rna_ID_name_length(struct PointerRNA *ptr); @@ -242,11 +242,12 @@ void rna_iterator_listbase_end(struct CollectionPropertyIterator *iter); typedef struct ArrayIterator { char *ptr; char *endptr; + void *free_ptr; /* will be free'd if set */ int itemsize; IteratorSkipFunc skip; } ArrayIterator; -void rna_iterator_array_begin(struct CollectionPropertyIterator *iter, void *ptr, int itemsize, int length, IteratorSkipFunc skip); +void rna_iterator_array_begin(struct CollectionPropertyIterator *iter, void *ptr, int itemsize, int length, int free_ptr, IteratorSkipFunc skip); void rna_iterator_array_next(struct CollectionPropertyIterator *iter); void *rna_iterator_array_get(struct CollectionPropertyIterator *iter); void *rna_iterator_array_dereference_get(struct CollectionPropertyIterator *iter); |