[Bf-blender-cvs] [d7a8a864edc] blender2.8: Minor cleanup & commenting.
Bastien Montagne
noreply at git.blender.org
Thu Mar 15 09:44:25 CET 2018
Commit: d7a8a864edcd5f288ea8de070fe9d49397c0e928
Author: Bastien Montagne
Date: Thu Mar 15 09:44:03 2018 +0100
Branches: blender2.8
https://developer.blender.org/rBd7a8a864edcd5f288ea8de070fe9d49397c0e928
Minor cleanup & commenting.
===================================================================
M source/blender/makesrna/intern/rna_access.c
===================================================================
diff --git a/source/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c
index ab293af6212..38aec79e78a 100644
--- a/source/blender/makesrna/intern/rna_access.c
+++ b/source/blender/makesrna/intern/rna_access.c
@@ -451,8 +451,9 @@ static void *rna_idproperty_check_ex(PropertyRNA **prop, PointerRNA *ptr, const
return idprop;
}
- else
+ else {
return return_rnaprop ? *prop : NULL;
+ }
}
{
@@ -7149,6 +7150,8 @@ bool RNA_struct_equals(PointerRNA *ptr_a, PointerRNA *ptr_b, eRNACompareMode mod
* When \a prop is given, \a prop_a and \a prop_b should always be NULL, and vice-versa.
* 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.
*/
static int rna_property_override_diff(
PointerRNA *ptr_a, PointerRNA *ptr_b, PropertyRNA *prop, PropertyRNA *prop_a, PropertyRNA *prop_b, const char *rna_path,
More information about the Bf-blender-cvs
mailing list