[Bf-blender-cvs] [77047d20880] master: Merge branch 'blender-v3.3-release'

[Hans Goudey]

Commit: 77047d2088016140da2669fcda9ba2a23336e14b
Author: Hans Goudey
Date:   Thu Aug 4 13:48:41 2022 -0500
Branches: master
https://developer.blender.org/rB77047d2088016140da2669fcda9ba2a23336e14b

Merge branch 'blender-v3.3-release'

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



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

diff --cc source/blender/blenkernel/intern/customdata.cc
index 4d11f4daedf,82356e06d2c..8444f15cb8b
--- a/source/blender/blenkernel/intern/customdata.cc
+++ b/source/blender/blenkernel/intern/customdata.cc
@@@ -3477,10 -3450,18 +3477,21 @@@ int CustomData_get_n_offset(const Custo
    return data->layers[layer_index].offset;
  }
  
 -int CustomData_get_n_offset(const CustomData *data, int type, int n)
++int CustomData_get_offset_named(const CustomData *data, int type, const char *name)
+ {
+   /* get the layer index of the active layer of type */
 -  int layer_index = CustomData_get_layer_index_n(data, type, n);
++  int layer_index = CustomData_get_named_layer_index(data, type, name);
+   if (layer_index == -1) {
+     return -1;
+   }
+ 
+   return data->layers[layer_index].offset;
+ }
+ 
 -bool CustomData_set_layer_name(const CustomData *data, int type, int n, const char *name)
 +bool CustomData_set_layer_name(const CustomData *data,
 +                               const int type,
 +                               const int n,
 +                               const char *name)
  {
    /* get the layer index of the first layer of type */
    const int layer_index = CustomData_get_layer_index_n(data, type, n);