[Bf-blender-cvs] [f5e87e9facc] refactor-mesh-uv-map-generic: Use correct layer name length for assert

Martijn Versteegh noreply at git.blender.org
Thu Jan 5 14:50:39 CET 2023


Commit: f5e87e9faccabb5371c30d122fb64cfbca58d031
Author: Martijn Versteegh
Date:   Thu Jan 5 14:44:46 2023 +0100
Branches: refactor-mesh-uv-map-generic
https://developer.blender.org/rBf5e87e9faccabb5371c30d122fb64cfbca58d031

Use correct layer name length for assert

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

M	source/blender/blenkernel/intern/attribute.cc

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

diff --git a/source/blender/blenkernel/intern/attribute.cc b/source/blender/blenkernel/intern/attribute.cc
index 402c693b329..f03911fbdc0 100644
--- a/source/blender/blenkernel/intern/attribute.cc
+++ b/source/blender/blenkernel/intern/attribute.cc
@@ -875,7 +875,7 @@ void BKE_id_attribute_copy_domains_temp(short id_type,
 const char *BKE_uv_map_vert_selection_name_get(const char *uv_map_name, char *buffer)
 {
   BLI_assert(strlen(UV_VERTSEL_NAME) == 2);
-  BLI_assert(strlen(uv_map_name) < MAX_CUSTOMDATA_LAYER_NAME - 5);
+  BLI_assert(strlen(uv_map_name) < MAX_CUSTOMDATA_LAYER_NAME - 4);
   BLI_snprintf(buffer, MAX_CUSTOMDATA_LAYER_NAME, ".%s.%s", UV_VERTSEL_NAME, uv_map_name);
   return buffer;
 }
@@ -883,7 +883,7 @@ const char *BKE_uv_map_vert_selection_name_get(const char *uv_map_name, char *bu
 const char *BKE_uv_map_edge_selection_name_get(const char *uv_map_name, char *buffer)
 {
   BLI_assert(strlen(UV_EDGESEL_NAME) == 2);
-  BLI_assert(strlen(uv_map_name) < MAX_CUSTOMDATA_LAYER_NAME - 5);
+  BLI_assert(strlen(uv_map_name) < MAX_CUSTOMDATA_LAYER_NAME - 4);
   BLI_snprintf(buffer, MAX_CUSTOMDATA_LAYER_NAME, ".%s.%s", UV_EDGESEL_NAME, uv_map_name);
   return buffer;
 }
@@ -891,7 +891,7 @@ const char *BKE_uv_map_edge_selection_name_get(const char *uv_map_name, char *bu
 const char *BKE_uv_map_pin_name_get(const char *uv_map_name, char *buffer)
 {
   BLI_assert(strlen(UV_PINNED_NAME) == 2);
-  BLI_assert(strlen(uv_map_name) < MAX_CUSTOMDATA_LAYER_NAME - 5);
+  BLI_assert(strlen(uv_map_name) < MAX_CUSTOMDATA_LAYER_NAME - 4);
   BLI_snprintf(buffer, MAX_CUSTOMDATA_LAYER_NAME, ".%s.%s", UV_PINNED_NAME, uv_map_name);
   return buffer;
 }



More information about the Bf-blender-cvs mailing list