[Bf-blender-cvs] [b38a59881be] master: Merge branch 'blender-v3.2-release'

[Joseph Eagar]

Commit: b38a59881be863bff079b4600a08d6b3a8b4b59a
Author: Joseph Eagar
Date:   Tue May 31 16:35:22 2022 -0700
Branches: master
https://developer.blender.org/rBb38a59881be863bff079b4600a08d6b3a8b4b59a

Merge branch 'blender-v3.2-release'

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



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

diff --cc source/blender/blenkernel/intern/attribute.cc
index cfddae7721b,870920bdf76..7ca38573d25
--- a/source/blender/blenkernel/intern/attribute.cc
+++ b/source/blender/blenkernel/intern/attribute.cc
@@@ -281,9 -271,38 +281,38 @@@ CustomDataLayer *BKE_id_attribute_find(
      }
    }
  
 -  return NULL;
 +  return nullptr;
  }
  
+ CustomDataLayer *BKE_id_attribute_search(const ID *id,
+                                          const char *name,
+                                          const CustomDataMask type_mask,
+                                          const AttributeDomainMask domain_mask)
+ {
+   DomainInfo info[ATTR_DOMAIN_NUM];
+   get_domains(id, info);
+ 
+   for (AttributeDomain domain = ATTR_DOMAIN_POINT; domain < ATTR_DOMAIN_NUM; domain++) {
+     if (!(domain_mask & ATTR_DOMAIN_AS_MASK(domain))) {
+       continue;
+     }
+ 
+     CustomData *customdata = info[domain].customdata;
+     if (customdata == NULL) {
+       return NULL;
+     }
+ 
+     for (int i = 0; i < customdata->totlayer; i++) {
+       CustomDataLayer *layer = &customdata->layers[i];
+       if ((CD_TYPE_AS_MASK(layer->type) & type_mask) && STREQ(layer->name, name)) {
+         return layer;
+       }
+     }
+   }
+ 
+   return NULL;
+ }
+ 
  int BKE_id_attributes_length(const ID *id, AttributeDomainMask domain_mask, CustomDataMask mask)
  {
    DomainInfo info[ATTR_DOMAIN_NUM];
@@@ -642,15 -661,16 +671,16 @@@ void BKE_id_attributes_render_color_set
  CustomDataLayer *BKE_id_attributes_color_find(const ID *id, const char *name)
  {
    CustomDataLayer *layer = BKE_id_attribute_find(id, name, CD_PROP_COLOR, ATTR_DOMAIN_POINT);
 -  if (layer == NULL) {
 +  if (layer == nullptr) {
      layer = BKE_id_attribute_find(id, name, CD_PROP_COLOR, ATTR_DOMAIN_CORNER);
    }
 -  if (layer == NULL) {
 +  if (layer == nullptr) {
      layer = BKE_id_attribute_find(id, name, CD_PROP_BYTE_COLOR, ATTR_DOMAIN_POINT);
    }
 -  if (layer == NULL) {
 +  if (layer == nullptr) {
      layer = BKE_id_attribute_find(id, name, CD_PROP_BYTE_COLOR, ATTR_DOMAIN_CORNER);
    }
+ 
    return layer;
  }