[Bf-blender-cvs] [e3634d6acf2] temp-pbvh-vbos: Merge branch 'master' into temp-pbvh-vbos

[Joseph Eagar]

Commit: e3634d6acf223808c4f48d59a738d95f774a0161
Author: Joseph Eagar
Date:   Mon Aug 29 11:57:52 2022 -0700
Branches: temp-pbvh-vbos
https://developer.blender.org/rBe3634d6acf223808c4f48d59a738d95f774a0161

Merge branch 'master' into temp-pbvh-vbos

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



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

diff --cc source/blender/blenkernel/BKE_customdata.h
index df726a667f3,3db75fff12c..a28458b4f36
--- a/source/blender/blenkernel/BKE_customdata.h
+++ b/source/blender/blenkernel/BKE_customdata.h
@@@ -449,8 -449,13 +449,14 @@@ int CustomData_get_stencil_layer(const 
   * if no such active layer is defined.
   */
  const char *CustomData_get_active_layer_name(const struct CustomData *data, int type);
 +const char *CustomData_get_render_layer_name(const struct CustomData *data, int type);
  
+ /**
+  * Returns name of the default layer of the given type or NULL
+  * if no such active layer is defined.
+  */
+ const char *CustomData_get_render_layer_name(const struct CustomData *data, int type);
+ 
  /**
   * Copies the data from source to the data element at index in the first layer of type
   * no effect if there is no layer of type.