[Bf-blender-cvs] [0329145712a] master: Cleanup: fix attribute.c incorrectly using CustomDataLayer.type to check for CD_FLAG_TEMPORARY instead of .flag.

[Joseph Eagar]

Commit: 0329145712a1748431a4d6fed705af6a22ecd0e4
Author: Joseph Eagar
Date:   Mon Apr 11 09:40:13 2022 -0700
Branches: master
https://developer.blender.org/rB0329145712a1748431a4d6fed705af6a22ecd0e4

Cleanup: fix attribute.c incorrectly using
         CustomDataLayer.type to check for
	 CD_FLAG_TEMPORARY instead of .flag.

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

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

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

diff --git a/source/blender/blenkernel/intern/attribute.c b/source/blender/blenkernel/intern/attribute.c
index d8c7c3c6dd7..ba2a63add1f 100644
--- a/source/blender/blenkernel/intern/attribute.c
+++ b/source/blender/blenkernel/intern/attribute.c
@@ -451,7 +451,7 @@ CustomDataLayer *BKE_id_attribute_from_index(ID *id,
 
     for (int i = 0; i < customdata->totlayer; i++) {
       if (!(layer_mask & CD_TYPE_AS_MASK(customdata->layers[i].type)) ||
-          (CD_TYPE_AS_MASK(customdata->layers[i].type) & CD_FLAG_TEMPORARY)) {
+          (customdata->layers[i].flag & CD_FLAG_TEMPORARY)) {
         continue;
       }
 
@@ -504,7 +504,7 @@ int BKE_id_attribute_to_index(const struct ID *id,
       CustomDataLayer *layer_iter = cdata->layers + j;
 
       if (!(CD_TYPE_AS_MASK(layer_iter->type) & layer_mask) ||
-          (CD_TYPE_AS_MASK(layer_iter->type) & CD_FLAG_TEMPORARY)) {
+          (layer_iter->flag & CD_FLAG_TEMPORARY)) {
         continue;
       }
 
@@ -542,7 +542,7 @@ CustomDataLayer *BKE_id_attribute_subset_active_get(const ID *id,
       CustomDataLayer *layer = cdata->layers + j;
 
       if (!(CD_TYPE_AS_MASK(layer->type) & mask) ||
-          (CD_TYPE_AS_MASK(layer->type) & CD_FLAG_TEMPORARY)) {
+          (layer->flag & CD_FLAG_TEMPORARY)) {
         continue;
       }
 
@@ -582,7 +582,7 @@ void BKE_id_attribute_subset_active_set(ID *id,
       CustomDataLayer *layer_iter = cdata->layers + j;
 
       if (!(CD_TYPE_AS_MASK(layer_iter->type) & mask) ||
-          (CD_TYPE_AS_MASK(layer_iter->type) & CD_FLAG_TEMPORARY)) {
+          (layer_iter->flag & CD_FLAG_TEMPORARY)) {
         continue;
       }