From d34b1b35bf30037b132c5275076ee72287685bc2 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Wed, 14 Mar 2018 17:53:29 +0100 Subject: 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. --- source/blender/blenkernel/intern/idprop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '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; } -- cgit v1.2.3 From b0823962e9b82d2bfa0551cb072bd61b67ddc773 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Wed, 14 Mar 2018 18:05:09 +0100 Subject: Style cleanup. --- source/blender/blenkernel/intern/idprop.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source/blender/blenkernel/intern/idprop.c') diff --git a/source/blender/blenkernel/intern/idprop.c b/source/blender/blenkernel/intern/idprop.c index 110e3f87fd0..5c13ba7907d 100644 --- a/source/blender/blenkernel/intern/idprop.c +++ b/source/blender/blenkernel/intern/idprop.c @@ -878,9 +878,10 @@ bool IDP_EqualsProperties_ex(IDProperty *prop1, IDProperty *prop2, const bool is if (prop1->len != prop2->len) return false; - for (i = 0; i < prop1->len; i++) + for (i = 0; i < prop1->len; i++) { if (!IDP_EqualsProperties_ex(&array1[i], &array2[i], is_strict)) return false; + } return true; } case IDP_ID: -- cgit v1.2.3