[Bf-blender-cvs] [279085e18e6] master: Fix: Issues with attribute comparison in geometry nodes tests
Hans Goudey
noreply at git.blender.org
Wed Dec 29 17:24:01 CET 2021
Commit: 279085e18e69735b30dae0e612cb7a160a734982
Author: Hans Goudey
Date: Wed Dec 29 10:23:53 2021 -0600
Branches: master
https://developer.blender.org/rB279085e18e69735b30dae0e612cb7a160a734982
Fix: Issues with attribute comparison in geometry nodes tests
A few typos in 17770192fb0c5fddda lead to an incorrect count of custom
data layers in the test meshes. We only want to consider layers that are
not anonymous, and there was a copy and paste mistake.
===================================================================
M source/blender/blenkernel/intern/mesh.cc
===================================================================
diff --git a/source/blender/blenkernel/intern/mesh.cc b/source/blender/blenkernel/intern/mesh.cc
index 334ec0c5423..12c63ab0523 100644
--- a/source/blender/blenkernel/intern/mesh.cc
+++ b/source/blender/blenkernel/intern/mesh.cc
@@ -456,14 +456,14 @@ static int customdata_compare(
for (int i = 0; i < c1->totlayer; i++) {
l1 = &c1->layers[i];
- if (CD_TYPE_AS_MASK(l1->type) & cd_mask_all_attr && l1->anonymous_id != nullptr) {
+ if ((CD_TYPE_AS_MASK(l1->type) & cd_mask_all_attr) && l1->anonymous_id == nullptr) {
layer_count1++;
}
}
for (int i = 0; i < c2->totlayer; i++) {
l2 = &c2->layers[i];
- if (CD_TYPE_AS_MASK(l1->type) & cd_mask_all_attr && l2->anonymous_id != nullptr) {
+ if ((CD_TYPE_AS_MASK(l2->type) & cd_mask_all_attr) && l2->anonymous_id == nullptr) {
layer_count2++;
}
}
More information about the Bf-blender-cvs
mailing list