diff options
author | Bastien Montagne <bastien@blender.org> | 2020-07-08 16:43:57 +0300 |
---|---|---|
committer | Bastien Montagne <bastien@blender.org> | 2020-07-08 16:43:57 +0300 |
commit | cb3c4218bf4f97a0105d6bd6b7625c452b17505e (patch) | |
tree | 258c56c21e827f8a81e8f990634707f418371dfe /source/blender/makesrna | |
parent | d1f4546a5918d3c8154a74294d5011f1ddb387d6 (diff) |
Minor cleanup in rna override code.
Diffstat (limited to 'source/blender/makesrna')
-rw-r--r-- | source/blender/makesrna/intern/rna_access_compare_override.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/makesrna/intern/rna_access_compare_override.c b/source/blender/makesrna/intern/rna_access_compare_override.c index 8cd8f80b7c8..6789b8173f3 100644 --- a/source/blender/makesrna/intern/rna_access_compare_override.c +++ b/source/blender/makesrna/intern/rna_access_compare_override.c @@ -186,7 +186,7 @@ static int rna_property_override_diff(Main *bmain, const size_t rna_path_len, eRNACompareMode mode, IDOverrideLibrary *override, - const int flags, + const eRNAOverrideMatch flags, eRNAOverrideMatchResult *r_report_flags); bool RNA_property_equals( @@ -256,7 +256,7 @@ static int rna_property_override_diff(Main *bmain, const size_t rna_path_len, eRNACompareMode mode, IDOverrideLibrary *override, - const int flags, + const eRNAOverrideMatch flags, eRNAOverrideMatchResult *r_report_flags) { if (prop != NULL) { @@ -274,13 +274,13 @@ static int rna_property_override_diff(Main *bmain, } if (mode == RNA_EQ_UNSET_MATCH_ANY) { - /* uninitialized properties are assumed to match anything */ + /* Unset properties are assumed to match anything. */ if (!RNA_property_is_set(ptr_a, prop_a) || !RNA_property_is_set(ptr_b, prop_b)) { return 0; } } else if (mode == RNA_EQ_UNSET_MATCH_NONE) { - /* unset properties never match set properties */ + /* Unset properties never match set properties. */ if (RNA_property_is_set(ptr_a, prop_a) != RNA_property_is_set(ptr_b, prop_b)) { return 1; } @@ -354,7 +354,7 @@ static int rna_property_override_diff(Main *bmain, } bool override_changed = false; - int diff_flags = flags; + eRNAOverrideMatch diff_flags = flags; if (!RNA_property_overridable_get(ptr_a, prop_a)) { diff_flags &= ~RNA_OVERRIDE_COMPARE_CREATE; } |