[Bf-blender-cvs] [aae00f624ce] refactor-mesh-uv-map-generic: Merge branch 'master' into refactor-mesh-uv-map-generic

[Martijn Versteegh]

Commit: aae00f624ceadb77e8bd43b0c1871fe6e9c20406
Author: Martijn Versteegh
Date:   Thu Jan 5 19:51:18 2023 +0100
Branches: refactor-mesh-uv-map-generic
https://developer.blender.org/rBaae00f624ceadb77e8bd43b0c1871fe6e9c20406

Merge branch 'master' into refactor-mesh-uv-map-generic

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



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

diff --cc source/blender/makesdna/DNA_customdata_types.h
index 6983af5ab79,0710ed6d30f..e1d8976b932
--- a/source/blender/makesdna/DNA_customdata_types.h
+++ b/source/blender/makesdna/DNA_customdata_types.h
@@@ -41,15 -48,13 +49,13 @@@ typedef struct CustomDataLayer 
    /** Layer data. */
    void *data;
    /**
-    * Run-time identifier for this layer. If no one has a strong reference to this id anymore,
-    * the layer can be removed. The custom data layer only has a weak reference to the id, because
-    * otherwise there will always be a strong reference and the attribute can't be removed
-    * automatically.
+    * Run-time identifier for this layer. Can be used to retrieve information about where this
+    * attribute was created.
     */
-   const struct AnonymousAttributeID *anonymous_id;
+   const AnonymousAttributeIDHandle *anonymous_id;
  } CustomDataLayer;
  
 -#define MAX_CUSTOMDATA_LAYER_NAME 64
 +#define MAX_CUSTOMDATA_LAYER_NAME 68
  
  typedef struct CustomDataExternal {
    /** FILE_MAX. */