[Bf-blender-cvs] [cb3c4218bf4] master: Minor cleanup in rna override code.
Bastien Montagne
noreply at git.blender.org
Wed Jul 8 15:44:19 CEST 2020
Commit: cb3c4218bf4f97a0105d6bd6b7625c452b17505e
Author: Bastien Montagne
Date: Wed Jul 8 15:43:57 2020 +0200
Branches: master
https://developer.blender.org/rBcb3c4218bf4f97a0105d6bd6b7625c452b17505e
Minor cleanup in rna override code.
===================================================================
M source/blender/makesrna/intern/rna_access_compare_override.c
===================================================================
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;
}
More information about the Bf-blender-cvs
mailing list