diff options
Diffstat (limited to 'source/blender/blenkernel/intern/attribute.c')
-rw-r--r-- | source/blender/blenkernel/intern/attribute.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/source/blender/blenkernel/intern/attribute.c b/source/blender/blenkernel/intern/attribute.c index d8c7c3c6dd7..307868ce6d9 100644 --- a/source/blender/blenkernel/intern/attribute.c +++ b/source/blender/blenkernel/intern/attribute.c @@ -292,7 +292,7 @@ int BKE_id_attributes_length(const ID *id, AttributeDomainMask domain_mask, Cust return length; } -AttributeDomain BKE_id_attribute_domain(ID *id, const CustomDataLayer *layer) +AttributeDomain BKE_id_attribute_domain(const ID *id, const CustomDataLayer *layer) { DomainInfo info[ATTR_DOMAIN_NUM]; get_domains(id, info); @@ -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; } @@ -541,8 +541,7 @@ CustomDataLayer *BKE_id_attribute_subset_active_get(const ID *id, for (int j = 0; j < cdata->totlayer; j++) { CustomDataLayer *layer = cdata->layers + j; - if (!(CD_TYPE_AS_MASK(layer->type) & mask) || - (CD_TYPE_AS_MASK(layer->type) & CD_FLAG_TEMPORARY)) { + if (!(CD_TYPE_AS_MASK(layer->type) & mask) || (layer->flag & CD_FLAG_TEMPORARY)) { continue; } @@ -581,8 +580,7 @@ void BKE_id_attribute_subset_active_set(ID *id, for (int j = 0; j < cdata->totlayer; j++) { 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)) { + if (!(CD_TYPE_AS_MASK(layer_iter->type) & mask) || (layer_iter->flag & CD_FLAG_TEMPORARY)) { continue; } |