[Bf-blender-cvs] [cc9c4e27444] master: CustomData: Add function to get name of default layer

Hans Goudey noreply at git.blender.org
Fri Aug 26 18:16:23 CEST 2022


Commit: cc9c4e274440e538a0d0f1988dfef5cff13f6f29
Author: Hans Goudey
Date:   Fri Aug 26 11:15:32 2022 -0500
Branches: master
https://developer.blender.org/rBcc9c4e274440e538a0d0f1988dfef5cff13f6f29

CustomData: Add function to get name of default layer

Used by D14365

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

M	source/blender/blenkernel/BKE_customdata.h
M	source/blender/blenkernel/intern/customdata.cc

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

diff --git a/source/blender/blenkernel/BKE_customdata.h b/source/blender/blenkernel/BKE_customdata.h
index 1ba0373f194..3db75fff12c 100644
--- a/source/blender/blenkernel/BKE_customdata.h
+++ b/source/blender/blenkernel/BKE_customdata.h
@@ -450,6 +450,12 @@ int CustomData_get_stencil_layer(const struct CustomData *data, int type);
  */
 const char *CustomData_get_active_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.
diff --git a/source/blender/blenkernel/intern/customdata.cc b/source/blender/blenkernel/intern/customdata.cc
index 6d89e1621d5..1f70ab587bf 100644
--- a/source/blender/blenkernel/intern/customdata.cc
+++ b/source/blender/blenkernel/intern/customdata.cc
@@ -2627,6 +2627,12 @@ const char *CustomData_get_active_layer_name(const CustomData *data, const int t
   return layer_index < 0 ? nullptr : data->layers[layer_index].name;
 }
 
+const char *CustomData_get_render_layer_name(const CustomData *data, const int type)
+{
+  const int layer_index = CustomData_get_render_layer_index(data, type);
+  return layer_index < 0 ? nullptr : data->layers[layer_index].name;
+}
+
 void CustomData_set_layer_active(CustomData *data, const int type, const int n)
 {
   for (int i = 0; i < data->totlayer; i++) {



More information about the Bf-blender-cvs mailing list