archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Tests: exclude anonymous attributes from mesh comparison

Browse Source 
The set of anonymous attributes on a geometry is not visible to the user.
This commit is contained in:
Jacques Lucke
2021-11-24 10:37:06 +01:00
parent e0763760e4
commit 17770192fb
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/blenkernel/intern/mesh.cc
View File

@@ -442,13 +442,15 @@ static int customdata_compare(
const uint64_t cd_mask_all_attr = CD_MASK_PROP_ALL | cd_mask_non_generic; const uint64_t cd_mask_all_attr = CD_MASK_PROP_ALL | cd_mask_non_generic;
for (int i = 0; i < c1->totlayer; i++) { for (int i = 0; i < c1->totlayer; i++) {
if (CD_TYPE_AS_MASK(c1->layers[i].type) & cd_mask_all_attr) { l1 = &c1->layers[i];
if (CD_TYPE_AS_MASK(l1->type) & cd_mask_all_attr && l1->anonymous_id != nullptr) {
layer_count1++; layer_count1++;
} }
} }
for (int i = 0; i < c2->totlayer; i++) { for (int i = 0; i < c2->totlayer; i++) {
if (CD_TYPE_AS_MASK(c2->layers[i].type) & cd_mask_all_attr) { l2 = &c2->layers[i];
if (CD_TYPE_AS_MASK(l1->type) & cd_mask_all_attr && l2->anonymous_id != nullptr) {
layer_count2++; layer_count2++;
} }
} }
@@ -464,7 +466,8 @@ static int customdata_compare(
l1 = c1->layers + i1; l1 = c1->layers + i1;
for (int i2 = 0; i2 < c2->totlayer; i2++) { for (int i2 = 0; i2 < c2->totlayer; i2++) {
l2 = c2->layers + i2; l2 = c2->layers + i2;
if (l1->type != l2->type || !STREQ(l1->name, l2->name)) { if (l1->type != l2->type || !STREQ(l1->name, l2->name) || l1->anonymous_id != nullptr ||
l2->anonymous_id != nullptr) {
continue; continue;
} }
/* At this point `l1` and `l2` have the same name and type, so they should be compared. */ /* At this point `l1` and `l2` have the same name and type, so they should be compared. */