[Bf-blender-cvs] [d34b1b35bf3] master: Fix (unreported) broken IDarray case in IDP_EqualsProperties_ex.

Bastien Montagne noreply at git.blender.org
Wed Mar 14 18:04:39 CET 2018


Commit: d34b1b35bf30037b132c5275076ee72287685bc2
Author: Bastien Montagne
Date:   Wed Mar 14 17:53:29 2018 +0100
Branches: master
https://developer.blender.org/rBd34b1b35bf30037b132c5275076ee72287685bc2

Fix (unreported) broken IDarray case in IDP_EqualsProperties_ex.

For IDProps IDarray, IDP_EqualsProperties was called for each item,
instead of IDP_EqualsProperties_ex, discarding value of `is_strict`
option.

Probably not an issue with current code, though.

===================================================================

M	source/blender/blenkernel/intern/idprop.c

===================================================================

diff --git a/source/blender/blenkernel/intern/idprop.c b/source/blender/blenkernel/intern/idprop.c
index 45b41fa01ed..110e3f87fd0 100644
--- a/source/blender/blenkernel/intern/idprop.c
+++ b/source/blender/blenkernel/intern/idprop.c
@@ -879,7 +879,7 @@ bool IDP_EqualsProperties_ex(IDProperty *prop1, IDProperty *prop2, const bool is
 				return false;
 
 			for (i = 0; i < prop1->len; i++)
-				if (!IDP_EqualsProperties(&array1[i], &array2[i]))
+				if (!IDP_EqualsProperties_ex(&array1[i], &array2[i], is_strict))
 					return false;
 			return true;
 		}



More information about the Bf-blender-cvs mailing list