diff options
author | Miika Hamalainen <blender@miikah.org> | 2011-10-04 15:42:44 +0400 |
---|---|---|
committer | Miika Hamalainen <blender@miikah.org> | 2011-10-04 15:42:44 +0400 |
commit | e8bb972f3c04b00f6e813b61332c53213c12e8c4 (patch) | |
tree | 5d05e7c8421c5af4e034ff3a01ebe34a2d94b9ec /source/blender/makesrna/intern/rna_dynamicpaint.c | |
parent | 9e9b26b8ba54227f79f97acc87893611d61b9831 (diff) | |
parent | 019dca9c54289136b34c688a048ee009e2e852ee (diff) |
Merge with trunk r40782
Diffstat (limited to 'source/blender/makesrna/intern/rna_dynamicpaint.c')
-rw-r--r-- | source/blender/makesrna/intern/rna_dynamicpaint.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_dynamicpaint.c b/source/blender/makesrna/intern/rna_dynamicpaint.c index f53213f0a46..0c213eed249 100644 --- a/source/blender/makesrna/intern/rna_dynamicpaint.c +++ b/source/blender/makesrna/intern/rna_dynamicpaint.c @@ -660,7 +660,7 @@ static void rna_def_dynamic_paint_canvas_settings(BlenderRNA *brna) * Surface Slots */ prop= RNA_def_property(srna, "canvas_surfaces", PROP_COLLECTION, PROP_NONE); - RNA_def_property_collection_funcs(prop, "rna_DynamicPaint_surfaces_begin", "rna_iterator_listbase_next", "rna_iterator_listbase_end", "rna_iterator_listbase_get", 0, 0, 0); + RNA_def_property_collection_funcs(prop, "rna_DynamicPaint_surfaces_begin", "rna_iterator_listbase_next", "rna_iterator_listbase_end", "rna_iterator_listbase_get", NULL, NULL, NULL, NULL); RNA_def_property_struct_type(prop, "DynamicPaintSurface"); RNA_def_property_ui_text(prop, "Paint Surface List", "Paint surface list"); rna_def_canvas_surfaces(brna, prop); |