Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnkit Meel <ankitjmeel@gmail.com>2020-10-20 19:53:59 +0300
committerAnkit Meel <ankitjmeel@gmail.com>2020-10-20 22:38:26 +0300
commit10e2b771214af6d0e5589f267c6b1f10bfaea5f9 (patch)
tree1bda3c9ecad7226ca0cb66f91dc3c2c8edc3dbd8 /source/blender/makesrna/intern/rna_access_compare_override.c
parent6c2bea64922160cd863b424d036f2ae167deb6e9 (diff)
Cleanup: makesrna, Clang-tidy else-after-return-fixes.
It got left out of {rBc04088fed1b8faea6b2928bb5e09ab3}. No functional change.
Diffstat (limited to 'source/blender/makesrna/intern/rna_access_compare_override.c')
-rw-r--r--source/blender/makesrna/intern/rna_access_compare_override.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/source/blender/makesrna/intern/rna_access_compare_override.c b/source/blender/makesrna/intern/rna_access_compare_override.c
index 202864a7d82..6a90d140cce 100644
--- a/source/blender/makesrna/intern/rna_access_compare_override.c
+++ b/source/blender/makesrna/intern/rna_access_compare_override.c
@@ -80,11 +80,9 @@ bool RNA_property_overridable_get(PointerRNA *ptr, PropertyRNA *prop)
return !(prop->flag_override & PROPOVERRIDE_NO_COMPARISON) &&
(prop->flag_override & PROPOVERRIDE_OVERRIDABLE_LIBRARY);
}
- else {
- /* If this is a real 'pure' IDProp (aka custom property), we want to use the IDProp flag. */
- IDProperty *idprop = (IDProperty *)prop;
- return (idprop->flag & IDP_FLAG_OVERRIDABLE_LIBRARY) != 0;
- }
+ /* If this is a real 'pure' IDProp (aka custom property), we want to use the IDProp flag. */
+ IDProperty *idprop = (IDProperty *)prop;
+ return (idprop->flag & IDP_FLAG_OVERRIDABLE_LIBRARY) != 0;
}
/* Should only be used for custom properties */
@@ -208,7 +206,7 @@ bool RNA_struct_equals(Main *bmain, PointerRNA *ptr_a, PointerRNA *ptr_b, eRNACo
if (ptr_a == NULL && ptr_b == NULL) {
return true;
}
- else if (ptr_a == NULL || ptr_b == NULL) {
+ if (ptr_a == NULL || ptr_b == NULL) {
return false;
}
else if (ptr_a->type != ptr_b->type) {