diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-05-20 11:06:09 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-05-20 16:11:57 +0300 |
commit | d00c54c855d44a81f8793fb380e7b7e4c3979a30 (patch) | |
tree | 96a683256819cfb25eea45ea42ae395cb4eba40d /source/blender/makesrna/intern/rna_access.c | |
parent | 88d2d82031eafa36c4dc7836d0d8e535b5e6e1f3 (diff) |
Cleanup: reorder report argument for pointer assignment
Most code uses ReportList argument last (or at least not first)
when an optional report list can be passed in.
Diffstat (limited to 'source/blender/makesrna/intern/rna_access.c')
-rw-r--r-- | source/blender/makesrna/intern/rna_access.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c index b56a031f9df..20358ca80fd 100644 --- a/source/blender/makesrna/intern/rna_access.c +++ b/source/blender/makesrna/intern/rna_access.c @@ -3733,10 +3733,10 @@ PointerRNA RNA_property_pointer_get(PointerRNA *ptr, PropertyRNA *prop) } } -void RNA_property_pointer_set(ReportList *reports, - PointerRNA *ptr, +void RNA_property_pointer_set(PointerRNA *ptr, PropertyRNA *prop, - PointerRNA ptr_value) + PointerRNA ptr_value, + ReportList *reports) { PointerPropertyRNA *pprop = (PointerPropertyRNA *)prop; BLI_assert(RNA_property_type(prop) == PROP_POINTER); @@ -3755,7 +3755,7 @@ void RNA_property_pointer_set(ReportList *reports, /* RNA */ if (pprop->set && !((prop->flag & PROP_NEVER_NULL) && ptr_value.data == NULL) && !((prop->flag & PROP_ID_SELF_CHECK) && ptr->id.data == ptr_value.id.data)) { - pprop->set(reports, ptr, ptr_value); + pprop->set(ptr, ptr_value, reports); } /* IDProperty */ else if (prop->flag & PROP_EDITABLE) { @@ -6427,7 +6427,7 @@ void RNA_pointer_set(PointerRNA *ptr, const char *name, PointerRNA ptr_value) PropertyRNA *prop = RNA_struct_find_property(ptr, name); if (prop) { - RNA_property_pointer_set(NULL, ptr, prop, ptr_value); + RNA_property_pointer_set(ptr, prop, ptr_value, NULL); } else { printf("%s: %s.%s not found.\n", __func__, ptr->type->identifier, name); @@ -7976,7 +7976,7 @@ bool RNA_property_reset(PointerRNA *ptr, PropertyRNA *prop, int index) case PROP_POINTER: { PointerRNA value = RNA_property_pointer_get_default(ptr, prop); - RNA_property_pointer_set(NULL, ptr, prop, value); + RNA_property_pointer_set(ptr, prop, value, NULL); return true; } |