diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-03-16 16:10:04 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-03-16 19:49:54 +0300 |
commit | c722fd2184bf780932aaadef6c790c8f5ea4191a (patch) | |
tree | 2a67ee7a79b0fc8d5b89f0508b07461168937940 /source/blender | |
parent | 36e7de9eb329e122605e3fe1ba80585d3aff1b26 (diff) |
Some more minor cleanups.
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/makesrna/RNA_access.h | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_access.c | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/source/blender/makesrna/RNA_access.h b/source/blender/makesrna/RNA_access.h index 33f222b9755..1058099e9ef 100644 --- a/source/blender/makesrna/RNA_access.h +++ b/source/blender/makesrna/RNA_access.h @@ -1307,7 +1307,7 @@ struct IDOverrideStaticPropertyOperation *RNA_property_override_property_operati PointerRNA *ptr, PropertyRNA *prop, const short operation, const int index, const bool strict, bool *r_strict, bool *r_created); -int RNA_property_override_status(PointerRNA *ptr, PropertyRNA *prop, const int index); +eRNAOverrideStatus RNA_property_override_status(PointerRNA *ptr, PropertyRNA *prop, const int index); void RNA_struct_state_owner_set(const char *name); const char *RNA_struct_state_owner_get(void); diff --git a/source/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c index 38aec79e78a..b63cebbdde2 100644 --- a/source/blender/makesrna/intern/rna_access.c +++ b/source/blender/makesrna/intern/rna_access.c @@ -7151,11 +7151,12 @@ bool RNA_struct_equals(PointerRNA *ptr_a, PointerRNA *ptr_b, eRNACompareMode mod * This is necessary, because we cannot perform 'set/unset' checks on resolved properties * (unset IDProps would merely be NULL then). * - * \note When there is no equality, but we cannot determine an order (greater than/lesser then), we return 1. + * \note When there is no equality, but we cannot determine an order (greater than/lesser than), we return 1. */ static int rna_property_override_diff( - PointerRNA *ptr_a, PointerRNA *ptr_b, PropertyRNA *prop, PropertyRNA *prop_a, PropertyRNA *prop_b, const char *rna_path, - eRNACompareMode mode, IDOverrideStatic *override, const int flags, eRNAOverrideMatchResult *r_report_flags) + PointerRNA *ptr_a, PointerRNA *ptr_b, PropertyRNA *prop, PropertyRNA *prop_a, PropertyRNA *prop_b, + const char *rna_path, eRNACompareMode mode, + IDOverrideStatic *override, const int flags, eRNAOverrideMatchResult *r_report_flags) { if (prop != NULL) { BLI_assert(prop_a == NULL && prop_b == NULL); @@ -7681,7 +7682,7 @@ IDOverrideStaticPropertyOperation *RNA_property_override_property_operation_get( return BKE_override_static_property_operation_get(op, operation, NULL, NULL, index, index, strict, r_strict, r_created); } -int RNA_property_override_status(PointerRNA *ptr, PropertyRNA *prop, const int index) +eRNAOverrideStatus RNA_property_override_status(PointerRNA *ptr, PropertyRNA *prop, const int index) { int override_status = 0; |