Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-05-21 13:37:54 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-05-21 13:37:54 +0300
commitbdc3335016ca71b8efd8b61c986d6bbf611a5c46 (patch)
tree04de903e5e5f0d6692b77a7b6a48247eb8844081 /source/blender/makesrna/intern/makesrna.c
parent21777533fbef067fd680db9b6c6e5e79b823af9d (diff)
parent882daeffc5f189e9278f8b6a9f66df77aae0f306 (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesrna/intern/makesrna.c')
-rw-r--r--source/blender/makesrna/intern/makesrna.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/source/blender/makesrna/intern/makesrna.c b/source/blender/makesrna/intern/makesrna.c
index 183db621642..1c55925809a 100644
--- a/source/blender/makesrna/intern/makesrna.c
+++ b/source/blender/makesrna/intern/makesrna.c
@@ -2092,8 +2092,16 @@ static void rna_def_struct_function_call_impl_cpp(FILE *f, StructRNA *srna, Func
if (dp->prop->type == PROP_POINTER)
if ((dp->prop->flag_parameter & PARM_RNAPTR) && !(dp->prop->flag & PROP_THICK_WRAP))
fprintf(f, "(::%s *) &%s.ptr", rna_parameter_type_name(dp->prop), rna_safe_id(dp->prop->identifier));
- else if (dp->prop->flag_parameter & PARM_OUTPUT)
- fprintf(f, "(::%s **) &%s->ptr.data", rna_parameter_type_name(dp->prop), rna_safe_id(dp->prop->identifier));
+ else if (dp->prop->flag_parameter & PARM_OUTPUT) {
+ if (dp->prop->flag_parameter & PARM_RNAPTR) {
+ fprintf(f, "&%s->ptr",
+ rna_safe_id(dp->prop->identifier));
+ }
+ else {
+ fprintf(f, "(::%s **) &%s->ptr.data",
+ rna_parameter_type_name(dp->prop), rna_safe_id(dp->prop->identifier));
+ }
+ }
else
fprintf(f, "(::%s *) %s.ptr.data", rna_parameter_type_name(dp->prop), rna_safe_id(dp->prop->identifier));
else