From 0fb6cc72fd2ecfe9af7037dfbefdb0a70112ee2b Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 12 Apr 2025 13:35:43 +1000 Subject: [PATCH] Cleanup: add STRNLEN macros to prevent incorrect sizeof() use Missed in recent cleanup. --- .../blender/blenkernel/intern/grease_pencil_convert_legacy.cc | 3 +-- source/blender/blenlib/BLI_string_utf8.h | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/source/blender/blenkernel/intern/grease_pencil_convert_legacy.cc b/source/blender/blenkernel/intern/grease_pencil_convert_legacy.cc index b4b2b4f01cc..b8b53f42175 100644 --- a/source/blender/blenkernel/intern/grease_pencil_convert_legacy.cc +++ b/source/blender/blenkernel/intern/grease_pencil_convert_legacy.cc @@ -1046,8 +1046,7 @@ static void legacy_gpencil_to_grease_pencil(ConversionData &conversion_data, int layer_idx = 0; LISTBASE_FOREACH_INDEX (bGPDlayer *, gpl, &gpd.layers, layer_idx) { /* Create a new layer. */ - Layer &new_layer = grease_pencil.add_layer( - StringRefNull(gpl->info, BLI_strnlen(gpl->info, 128))); + Layer &new_layer = grease_pencil.add_layer(StringRefNull(gpl->info, STRNLEN(gpl->info))); /* Flags. */ new_layer.set_visible((gpl->flag & GP_LAYER_HIDE) == 0); diff --git a/source/blender/blenlib/BLI_string_utf8.h b/source/blender/blenlib/BLI_string_utf8.h index 4dee8152cf3..9a0fdf5c813 100644 --- a/source/blender/blenlib/BLI_string_utf8.h +++ b/source/blender/blenlib/BLI_string_utf8.h @@ -265,5 +265,4 @@ int BLI_str_utf8_offset_from_column_with_tabs(const char *str, #define STRNLEN_UTF8(str) BLI_strnlen_utf8(str, ARRAY_SIZE(str)) - /** \} */