Merge branch 'master' into blender2.8
This commit is contained in:
commit
bdc3335016
@ -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->type == PROP_POINTER)
|
||||||
if ((dp->prop->flag_parameter & PARM_RNAPTR) && !(dp->prop->flag & PROP_THICK_WRAP))
|
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));
|
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)
|
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));
|
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
|
else
|
||||||
fprintf(f, "(::%s *) %s.ptr.data", rna_parameter_type_name(dp->prop), rna_safe_id(dp->prop->identifier));
|
fprintf(f, "(::%s *) %s.ptr.data", rna_parameter_type_name(dp->prop), rna_safe_id(dp->prop->identifier));
|
||||||
else
|
else
|
||||||
|
Loading…
Reference in New Issue
Block a user