diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-01-25 02:44:48 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-01-25 02:44:48 +0400 |
commit | 75a4832af3cf1c5edb23f9816b290d6c5f61a64c (patch) | |
tree | 7d18f8384b9219300a42f5a357ddd4a8f17c13b1 /source/blender/makesrna/intern/rna_object_api.c | |
parent | 3f31145d2971d973d401878e9223de44ef3952fe (diff) | |
parent | 1aadbdedc748c1bc63b1ffa25793858a06c4ba21 (diff) |
svn merge ^/trunk/blender -r43676:43685
Diffstat (limited to 'source/blender/makesrna/intern/rna_object_api.c')
-rw-r--r-- | source/blender/makesrna/intern/rna_object_api.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_object_api.c b/source/blender/makesrna/intern/rna_object_api.c index fc313d3b1de..6783e5d4788 100644 --- a/source/blender/makesrna/intern/rna_object_api.c +++ b/source/blender/makesrna/intern/rna_object_api.c @@ -643,7 +643,7 @@ void RNA_api_object(StructRNA *srna) parm= RNA_def_enum(func, "type", mesh_dm_info_items, 0, "", "Modifier settings to apply"); RNA_def_property_flag(parm, PROP_REQUIRED); /* weak!, no way to return dynamic string type */ - parm= RNA_def_string(func, "result", "result", 16384, "result", ""); + parm= RNA_def_string(func, "result", "", 16384, "result", ""); RNA_def_property_flag(parm, PROP_THICK_WRAP); /* needed for string return value */ RNA_def_function_output(func, parm); #endif /* NDEBUG */ |