From b905b02222799031c78fefdfd7ba830872505e7a Mon Sep 17 00:00:00 2001 From: Damien Picard Date: Fri, 28 Apr 2023 23:44:37 +0200 Subject: [PATCH] Remove newly added "Theme" i18n context, replace its use by "Color" Pull Request: https://projects.blender.org/blender/blender/pulls/107139 --- source/blender/blentranslation/BLT_translation.h | 2 -- source/blender/makesrna/intern/rna_xr.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/source/blender/blentranslation/BLT_translation.h b/source/blender/blentranslation/BLT_translation.h index 2ee6be1aa80..fe4b3ab09a0 100644 --- a/source/blender/blentranslation/BLT_translation.h +++ b/source/blender/blentranslation/BLT_translation.h @@ -130,7 +130,6 @@ const char *BLT_translate_do_new_dataname(const char *msgctxt, const char *msgid #define BLT_I18NCONTEXT_AMOUNT "Amount" #define BLT_I18NCONTEXT_COLOR "Color" #define BLT_I18NCONTEXT_CONSTRAINT "Constraint" -#define BLT_I18NCONTEXT_THEME "Theme" #define BLT_I18NCONTEXT_TIME "Time" #define BLT_I18NCONTEXT_UNIT "Unit" @@ -201,7 +200,6 @@ typedef struct { BLT_I18NCONTEXTS_ITEM(BLT_I18NCONTEXT_AMOUNT, "amount"), \ BLT_I18NCONTEXTS_ITEM(BLT_I18NCONTEXT_COLOR, "color"), \ BLT_I18NCONTEXTS_ITEM(BLT_I18NCONTEXT_CONSTRAINT, "constraint"), \ - BLT_I18NCONTEXTS_ITEM(BLT_I18NCONTEXT_THEME, "theme"), \ BLT_I18NCONTEXTS_ITEM(BLT_I18NCONTEXT_TIME, "time"), \ BLT_I18NCONTEXTS_ITEM(BLT_I18NCONTEXT_UNIT, "unit"), \ { \ diff --git a/source/blender/makesrna/intern/rna_xr.c b/source/blender/makesrna/intern/rna_xr.c index 460b231d40d..ba574160b09 100644 --- a/source/blender/makesrna/intern/rna_xr.c +++ b/source/blender/makesrna/intern/rna_xr.c @@ -2020,7 +2020,7 @@ static void rna_def_xr_session_settings(BlenderRNA *brna) RNA_def_property_enum_items(prop, controller_draw_styles); RNA_def_property_ui_text( prop, "Controller Draw Style", "Style to use when drawing VR controllers"); - RNA_def_property_translation_context(prop, BLT_I18NCONTEXT_THEME); + RNA_def_property_translation_context(prop, BLT_I18NCONTEXT_COLOR); RNA_def_property_update(prop, NC_WM | ND_XR_DATA_CHANGED, NULL); prop = RNA_def_property(srna, "clip_start", PROP_FLOAT, PROP_DISTANCE);