diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-03-14 20:07:01 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-03-14 20:10:31 +0300 |
| commit | 9009622b5464f13cc9521663b43605bf85e8e0b5 (patch) | |
| tree | 72d95313921af3c5687e13e58dcf6f9c4fe68232 /source/blender/blenkernel/intern/idprop.c | |
| parent | 9521b67ac0db5958df14ff92e5334bca07902481 (diff) | |
| parent | b0823962e9b82d2bfa0551cb072bd61b67ddc773 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/idprop.c')
| -rw-r--r-- | source/blender/blenkernel/intern/idprop.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/idprop.c b/source/blender/blenkernel/intern/idprop.c index 33a665ba06e..87e5ed8cc1e 100644 --- a/source/blender/blenkernel/intern/idprop.c +++ b/source/blender/blenkernel/intern/idprop.c @@ -905,9 +905,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++) - if (!IDP_EqualsProperties(&array1[i], &array2[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: |