From 1bfa52b57cd06d2d87d1366f4e1b7ea100180e5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Mon, 13 Jan 2025 17:40:22 +0100 Subject: [PATCH] Anim: i18n-ize default Action layer names Internationalize the default Action layer name. Instead of `"Layer"`, use `DATA_("Layer")`. This is the same for other defaults in Blender. When upgrading a legacy Action to a slotted Action, it also gets a layer and a keyframe strip on that layer. Those are not shown in the user interface yet, but will in the future. Pull Request: https://projects.blender.org/blender/blender/pulls/133009 --- source/blender/animrig/intern/action.cc | 2 +- source/blender/animrig/intern/versioning.cc | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/source/blender/animrig/intern/action.cc b/source/blender/animrig/intern/action.cc index 31e606be3bd..eae58a3c578 100644 --- a/source/blender/animrig/intern/action.cc +++ b/source/blender/animrig/intern/action.cc @@ -251,7 +251,7 @@ Layer &Action::layer_add(const std::optional name) STRNCPY_UTF8(new_layer.name, name.value().c_str()); } else { - STRNCPY_UTF8(new_layer.name, layer_default_name); + STRNCPY_UTF8(new_layer.name, DATA_(layer_default_name)); } grow_array_and_append<::ActionLayer *>(&this->layer_array, &this->layer_array_num, &new_layer); diff --git a/source/blender/animrig/intern/versioning.cc b/source/blender/animrig/intern/versioning.cc index 44823f102c9..5f1c042c897 100644 --- a/source/blender/animrig/intern/versioning.cc +++ b/source/blender/animrig/intern/versioning.cc @@ -31,6 +31,7 @@ namespace blender::animrig::versioning { constexpr const char *DEFAULT_VERSIONED_SLOT_NAME = "Legacy Slot"; +constexpr const char *DEFAULT_VERSIONED_LAYER_NAME = "Layer"; bool action_is_layered(const bAction &dna_action) { @@ -99,7 +100,7 @@ void convert_legacy_animato_action(bAction &dna_action) DATA_(DEFAULT_VERSIONED_SLOT_NAME)}; action.slot_identifier_define(slot, slot_identifier); - Layer &layer = action.layer_add("Layer"); + Layer &layer = action.layer_add(DATA_(DEFAULT_VERSIONED_LAYER_NAME)); blender::animrig::Strip &strip = layer.strip_add(action, blender::animrig::Strip::Type::Keyframe); Channelbag &bag = strip.data(action).channelbag_for_slot_ensure(slot);