diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-03-15 11:44:03 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-03-15 11:44:16 +0300 |
| commit | d7a8a864edcd5f288ea8de070fe9d49397c0e928 (patch) | |
| tree | 02cd859906c4d4671819a96b56945555f832e07e /source/blender/makesrna | |
| parent | 316ccc4a6e947bf46489bfe36d630a6a4648069f (diff) | |
Minor cleanup & commenting.
Diffstat (limited to 'source/blender/makesrna')
| -rw-r--r-- | source/blender/makesrna/intern/rna_access.c | 5 |
1 files changed, 4 insertions, 1 deletions
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, |