From c9ce4a201ac0acb8a77afadcb1a25283a789b1a2 Mon Sep 17 00:00:00 2001 From: Damien Picard Date: Fri, 31 Mar 2023 14:37:10 +0200 Subject: [PATCH 1/2] UI: replace "x" with multiplication sign when displaying calculation The multiplication sign looks like an "x" but should be used in its stead to display calculations and dimensions such as "1920x1080". It is supported in many fonts including DejaVu Sans, the font currently used for the UI. The modification was done only for strings which are displayed in the user interface, so this excludes prints. --- source/blender/editors/space_image/image_buttons.c | 2 +- source/blender/editors/space_view3d/view3d_draw.cc | 2 +- source/blender/makesrna/intern/rna_armature.cc | 4 ++-- source/blender/makesrna/intern/rna_dynamicpaint.c | 3 ++- source/blender/makesrna/intern/rna_nodetree.cc | 12 ++++++------ source/blender/makesrna/intern/rna_pose.cc | 11 ++++++----- source/blender/makesrna/intern/rna_scene.c | 8 ++++---- source/blender/makesrna/intern/rna_sequencer.c | 4 ++-- source/blender/makesrna/intern/rna_userdef.c | 8 ++++---- source/blender/makesrna/intern/rna_volume.c | 2 +- source/blender/windowmanager/intern/wm_operators.c | 2 +- 11 files changed, 30 insertions(+), 28 deletions(-) diff --git a/source/blender/editors/space_image/image_buttons.c b/source/blender/editors/space_image/image_buttons.c index 9721f25a724..d5099bb77c3 100644 --- a/source/blender/editors/space_image/image_buttons.c +++ b/source/blender/editors/space_image/image_buttons.c @@ -1202,7 +1202,7 @@ void uiTemplateImageInfo(uiLayout *layout, bContext *C, Image *ima, ImageUser *i const int len = MAX_IMAGE_INFO_LEN; int ofs = 0; - ofs += BLI_snprintf_rlen(str + ofs, len - ofs, TIP_("%d x %d, "), ibuf->x, ibuf->y); + ofs += BLI_snprintf_rlen(str + ofs, len - ofs, TIP_("%d \u00D7 %d, "), ibuf->x, ibuf->y); if (ibuf->float_buffer.data) { if (ibuf->channels != 4) { diff --git a/source/blender/editors/space_view3d/view3d_draw.cc b/source/blender/editors/space_view3d/view3d_draw.cc index 1ced6bbdd8b..9721a1a6227 100644 --- a/source/blender/editors/space_view3d/view3d_draw.cc +++ b/source/blender/editors/space_view3d/view3d_draw.cc @@ -1467,7 +1467,7 @@ static void draw_grid_unit_name( char numstr[32] = ""; UI_FontThemeColor(font_id, TH_TEXT_HI); if (v3d->grid != 1.0f) { - SNPRINTF(numstr, "%s x %.4g", grid_unit, v3d->grid); + SNPRINTF(numstr, "%s \u00D7 %.4g", grid_unit, v3d->grid); } *yoffset -= VIEW3D_OVERLAY_LINEHEIGHT; diff --git a/source/blender/makesrna/intern/rna_armature.cc b/source/blender/makesrna/intern/rna_armature.cc index 08b97560065..9b086dc464d 100644 --- a/source/blender/makesrna/intern/rna_armature.cc +++ b/source/blender/makesrna/intern/rna_armature.cc @@ -1226,14 +1226,14 @@ static void rna_def_bone(BlenderRNA *brna) RNA_def_property_float_sdna(prop, nullptr, "bone_mat"); RNA_def_property_multi_array(prop, 2, rna_matrix_dimsize_3x3); RNA_def_property_clear_flag(prop, PROP_EDITABLE); - RNA_def_property_ui_text(prop, "Bone Matrix", "3x3 bone matrix"); + RNA_def_property_ui_text(prop, "Bone Matrix", "3\u00D73 bone matrix"); prop = RNA_def_property(srna, "matrix_local", PROP_FLOAT, PROP_MATRIX); RNA_def_property_float_sdna(prop, nullptr, "arm_mat"); RNA_def_property_multi_array(prop, 2, rna_matrix_dimsize_4x4); RNA_def_property_clear_flag(prop, PROP_EDITABLE); RNA_def_property_ui_text( - prop, "Bone Armature-Relative Matrix", "4x4 bone matrix relative to armature"); + prop, "Bone Armature-Relative Matrix", "4\u00D74 bone matrix relative to armature"); prop = RNA_def_property(srna, "tail", PROP_FLOAT, PROP_TRANSLATION); RNA_def_property_float_sdna(prop, nullptr, "tail"); diff --git a/source/blender/makesrna/intern/rna_dynamicpaint.c b/source/blender/makesrna/intern/rna_dynamicpaint.c index 780d50c1158..628d54a9889 100644 --- a/source/blender/makesrna/intern/rna_dynamicpaint.c +++ b/source/blender/makesrna/intern/rna_dynamicpaint.c @@ -461,7 +461,8 @@ static void rna_def_canvas_surface(BlenderRNA *brna) prop = RNA_def_property(srna, "use_antialiasing", PROP_BOOLEAN, PROP_NONE); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_boolean_sdna(prop, NULL, "flags", MOD_DPAINT_ANTIALIAS); - RNA_def_property_ui_text(prop, "Anti-Aliasing", "Use 5x multisampling to smooth paint edges"); + RNA_def_property_ui_text( + prop, "Anti-Aliasing", "Use 5\u00D7 multisampling to smooth paint edges"); RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, "rna_DynamicPaintSurface_reset"); prop = RNA_def_property(srna, "brush_influence_scale", PROP_FLOAT, PROP_FACTOR); diff --git a/source/blender/makesrna/intern/rna_nodetree.cc b/source/blender/makesrna/intern/rna_nodetree.cc index 16c3fe4f80a..8d9ab144985 100644 --- a/source/blender/makesrna/intern/rna_nodetree.cc +++ b/source/blender/makesrna/intern/rna_nodetree.cc @@ -118,12 +118,12 @@ static const EnumPropertyItem node_quality_items[] = { }; static const EnumPropertyItem node_chunksize_items[] = { - {NTREE_CHUNKSIZE_32, "32", 0, "32x32", "Chunksize of 32x32"}, - {NTREE_CHUNKSIZE_64, "64", 0, "64x64", "Chunksize of 64x64"}, - {NTREE_CHUNKSIZE_128, "128", 0, "128x128", "Chunksize of 128x128"}, - {NTREE_CHUNKSIZE_256, "256", 0, "256x256", "Chunksize of 256x256"}, - {NTREE_CHUNKSIZE_512, "512", 0, "512x512", "Chunksize of 512x512"}, - {NTREE_CHUNKSIZE_1024, "1024", 0, "1024x1024", "Chunksize of 1024x1024"}, + {NTREE_CHUNKSIZE_32, "32", 0, "32\u00D732", "Chunksize of 32\u00D732"}, + {NTREE_CHUNKSIZE_64, "64", 0, "64\u00D764", "Chunksize of 64\u00D764"}, + {NTREE_CHUNKSIZE_128, "128", 0, "128\u00D7128", "Chunksize of 128\u00D7128"}, + {NTREE_CHUNKSIZE_256, "256", 0, "256\u00D7256", "Chunksize of 256\u00D7256"}, + {NTREE_CHUNKSIZE_512, "512", 0, "512\u00D7512", "Chunksize of 512\u00D7512"}, + {NTREE_CHUNKSIZE_1024, "1024", 0, "1024\u00D71024", "Chunksize of 1024\u00D71024"}, {0, nullptr, 0, nullptr, nullptr}, }; #endif diff --git a/source/blender/makesrna/intern/rna_pose.cc b/source/blender/makesrna/intern/rna_pose.cc index 1869399e4ea..44609d70b79 100644 --- a/source/blender/makesrna/intern/rna_pose.cc +++ b/source/blender/makesrna/intern/rna_pose.cc @@ -1143,10 +1143,11 @@ static void rna_def_pose_channel(BlenderRNA *brna) RNA_def_property_float_sdna(prop, nullptr, "chan_mat"); RNA_def_property_multi_array(prop, 2, rna_matrix_dimsize_4x4); RNA_def_property_clear_flag(prop, PROP_EDITABLE); - RNA_def_property_ui_text(prop, - "Channel Matrix", - "4x4 matrix of the bone's location/rotation/scale channels (including " - "animation and drivers) and the effect of bone constraints"); + RNA_def_property_ui_text( + prop, + "Channel Matrix", + "4\u00D74 matrix of the bone's location/rotation/scale channels (including " + "animation and drivers) and the effect of bone constraints"); /* writable because it touches loc/scale/rot directly */ prop = RNA_def_property(srna, "matrix_basis", PROP_FLOAT, PROP_MATRIX); @@ -1168,7 +1169,7 @@ static void rna_def_pose_channel(BlenderRNA *brna) RNA_def_property_ui_text( prop, "Pose Matrix", - "Final 4x4 matrix after constraints and drivers are applied, in the armature object space"); + "Final 4\u00D74 matrix after constraints and drivers are applied, in the armature object space"); RNA_def_property_update(prop, NC_OBJECT | ND_POSE, "rna_Pose_update"); /* Head/Tail Coordinates (in Pose Space) - Automatically calculated... */ diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index 5629eb56cb5..c161f876734 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -6320,10 +6320,10 @@ static void rna_def_scene_render_data(BlenderRNA *brna) static const EnumPropertyItem pixel_size_items[] = { {0, "AUTO", 0, "Automatic", "Automatic pixel size, depends on the user interface scale"}, - {1, "1", 0, "1x", "Render at full resolution"}, - {2, "2", 0, "2x", "Render at 50% resolution"}, - {4, "4", 0, "4x", "Render at 25% resolution"}, - {8, "8", 0, "8x", "Render at 12.5% resolution"}, + {1, "1", 0, "1\u00D7", "Render at full resolution"}, + {2, "2", 0, "2\u00D7", "Render at 50% resolution"}, + {4, "4", 0, "4\u00D7", "Render at 25% resolution"}, + {8, "8", 0, "8\u00D7", "Render at 12.5% resolution"}, {0, NULL, 0, NULL, NULL}, }; diff --git a/source/blender/makesrna/intern/rna_sequencer.c b/source/blender/makesrna/intern/rna_sequencer.c index a88c4286b40..7aee9554a9f 100644 --- a/source/blender/makesrna/intern/rna_sequencer.c +++ b/source/blender/makesrna/intern/rna_sequencer.c @@ -1649,8 +1649,8 @@ static const EnumPropertyItem transform_filter_items[] = { {SEQ_TRANSFORM_FILTER_NEAREST_3x3, "SUBSAMPLING_3x3", 0, - "Subsampling (3x3)", - "Use nearest with 3x3 subsamples during rendering"}, + "Subsampling (3\u00D73)", + "Use nearest with 3\u00D73 subsamples during rendering"}, {0, NULL, 0, NULL, NULL}, }; diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index dae2d97a349..250f22ee0c3 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -5454,10 +5454,10 @@ static void rna_def_userdef_system(BlenderRNA *brna) static const EnumPropertyItem anisotropic_items[] = { {1, "FILTER_0", 0, "Off", ""}, - {2, "FILTER_2", 0, "2x", ""}, - {4, "FILTER_4", 0, "4x", ""}, - {8, "FILTER_8", 0, "8x", ""}, - {16, "FILTER_16", 0, "16x", ""}, + {2, "FILTER_2", 0, "2\u00D7", ""}, + {4, "FILTER_4", 0, "4\u00D7", ""}, + {8, "FILTER_8", 0, "8\u00D7", ""}, + {16, "FILTER_16", 0, "16\u00D7", ""}, {0, NULL, 0, NULL, NULL}, }; diff --git a/source/blender/makesrna/intern/rna_volume.c b/source/blender/makesrna/intern/rna_volume.c index 4394197ae33..889fc2d0c31 100644 --- a/source/blender/makesrna/intern/rna_volume.c +++ b/source/blender/makesrna/intern/rna_volume.c @@ -418,7 +418,7 @@ static void rna_def_volume_display(BlenderRNA *brna) "FINE", 0, "Fine", - "Display box for each leaf node containing 8x8 voxels"}, + "Display box for each leaf node containing 8\u00D78 voxels"}, {0, NULL, 0, NULL, NULL}, }; diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index 8fdeac3faa4..ebb440f6a4f 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -3388,7 +3388,7 @@ static int redraw_timer_exec(bContext *C, wmOperator *op) BKE_reportf(op->reports, RPT_WARNING, - "%d x %s: %.4f ms, average: %.8f ms", + "%d \u00D7 %s: %.4f ms, average: %.8f ms", iter_steps, infostr, time_delta, -- 2.30.2 From f06ff2fb4568bafa934956a04a4ff963ea763379 Mon Sep 17 00:00:00 2001 From: Damien Picard Date: Tue, 27 Jun 2023 13:37:42 +0200 Subject: [PATCH 2/2] UI: use BLI_STR_UTF8_ macros for Unicode characters --- .../editors/space_view3d/view3d_draw.cc | 2 +- .../blender/makesrna/intern/rna_armature.cc | 10 +++-- .../makesrna/intern/rna_dynamicpaint.c | 8 +++- .../blender/makesrna/intern/rna_nodetree.cc | 37 ++++++++++++++++--- source/blender/makesrna/intern/rna_pose.cc | 20 +++++----- source/blender/makesrna/intern/rna_scene.c | 9 +++-- .../blender/makesrna/intern/rna_sequencer.c | 5 ++- source/blender/makesrna/intern/rna_userdef.c | 9 +++-- source/blender/makesrna/intern/rna_volume.c | 3 +- 9 files changed, 71 insertions(+), 32 deletions(-) diff --git a/source/blender/editors/space_view3d/view3d_draw.cc b/source/blender/editors/space_view3d/view3d_draw.cc index 9721a1a6227..4bb481ca071 100644 --- a/source/blender/editors/space_view3d/view3d_draw.cc +++ b/source/blender/editors/space_view3d/view3d_draw.cc @@ -1467,7 +1467,7 @@ static void draw_grid_unit_name( char numstr[32] = ""; UI_FontThemeColor(font_id, TH_TEXT_HI); if (v3d->grid != 1.0f) { - SNPRINTF(numstr, "%s \u00D7 %.4g", grid_unit, v3d->grid); + SNPRINTF(numstr, "%s " BLI_STR_UTF8_MULTIPLICATION_SIGN " %.4g", grid_unit, v3d->grid); } *yoffset -= VIEW3D_OVERLAY_LINEHEIGHT; diff --git a/source/blender/makesrna/intern/rna_armature.cc b/source/blender/makesrna/intern/rna_armature.cc index 9b086dc464d..4834ca41e41 100644 --- a/source/blender/makesrna/intern/rna_armature.cc +++ b/source/blender/makesrna/intern/rna_armature.cc @@ -9,6 +9,7 @@ #include #include "BLI_math.h" +#include "BLI_string_utf8_symbols.h" #include "BLT_translation.h" @@ -1226,14 +1227,17 @@ static void rna_def_bone(BlenderRNA *brna) RNA_def_property_float_sdna(prop, nullptr, "bone_mat"); RNA_def_property_multi_array(prop, 2, rna_matrix_dimsize_3x3); RNA_def_property_clear_flag(prop, PROP_EDITABLE); - RNA_def_property_ui_text(prop, "Bone Matrix", "3\u00D73 bone matrix"); + RNA_def_property_ui_text( + prop, "Bone Matrix", "3" BLI_STR_UTF8_MULTIPLICATION_SIGN "3 bone matrix"); prop = RNA_def_property(srna, "matrix_local", PROP_FLOAT, PROP_MATRIX); RNA_def_property_float_sdna(prop, nullptr, "arm_mat"); RNA_def_property_multi_array(prop, 2, rna_matrix_dimsize_4x4); RNA_def_property_clear_flag(prop, PROP_EDITABLE); - RNA_def_property_ui_text( - prop, "Bone Armature-Relative Matrix", "4\u00D74 bone matrix relative to armature"); + RNA_def_property_ui_text(prop, + "Bone Armature-Relative Matrix", + "4" BLI_STR_UTF8_MULTIPLICATION_SIGN + "4 bone matrix relative to armature"); prop = RNA_def_property(srna, "tail", PROP_FLOAT, PROP_TRANSLATION); RNA_def_property_float_sdna(prop, nullptr, "tail"); diff --git a/source/blender/makesrna/intern/rna_dynamicpaint.c b/source/blender/makesrna/intern/rna_dynamicpaint.c index 628d54a9889..56913923881 100644 --- a/source/blender/makesrna/intern/rna_dynamicpaint.c +++ b/source/blender/makesrna/intern/rna_dynamicpaint.c @@ -12,6 +12,8 @@ #include "BKE_dynamicpaint.h" #include "BKE_modifier.h" +#include "BLI_string_utf8_symbols.h" + #include "BLT_translation.h" #include "DNA_dynamicpaint_types.h" @@ -461,8 +463,10 @@ static void rna_def_canvas_surface(BlenderRNA *brna) prop = RNA_def_property(srna, "use_antialiasing", PROP_BOOLEAN, PROP_NONE); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_boolean_sdna(prop, NULL, "flags", MOD_DPAINT_ANTIALIAS); - RNA_def_property_ui_text( - prop, "Anti-Aliasing", "Use 5\u00D7 multisampling to smooth paint edges"); + RNA_def_property_ui_text(prop, + "Anti-Aliasing", + "Use 5" BLI_STR_UTF8_MULTIPLICATION_SIGN + " multisampling to smooth paint edges"); RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, "rna_DynamicPaintSurface_reset"); prop = RNA_def_property(srna, "brush_influence_scale", PROP_FLOAT, PROP_FACTOR); diff --git a/source/blender/makesrna/intern/rna_nodetree.cc b/source/blender/makesrna/intern/rna_nodetree.cc index 8d9ab144985..17ce5bcc3bf 100644 --- a/source/blender/makesrna/intern/rna_nodetree.cc +++ b/source/blender/makesrna/intern/rna_nodetree.cc @@ -11,6 +11,7 @@ #include #include "BLI_math.h" +#include "BLI_string_utf8_symbols.h" #include "BLI_utildefines.h" #include "BLF_api.h" @@ -118,12 +119,36 @@ static const EnumPropertyItem node_quality_items[] = { }; static const EnumPropertyItem node_chunksize_items[] = { - {NTREE_CHUNKSIZE_32, "32", 0, "32\u00D732", "Chunksize of 32\u00D732"}, - {NTREE_CHUNKSIZE_64, "64", 0, "64\u00D764", "Chunksize of 64\u00D764"}, - {NTREE_CHUNKSIZE_128, "128", 0, "128\u00D7128", "Chunksize of 128\u00D7128"}, - {NTREE_CHUNKSIZE_256, "256", 0, "256\u00D7256", "Chunksize of 256\u00D7256"}, - {NTREE_CHUNKSIZE_512, "512", 0, "512\u00D7512", "Chunksize of 512\u00D7512"}, - {NTREE_CHUNKSIZE_1024, "1024", 0, "1024\u00D71024", "Chunksize of 1024\u00D71024"}, + {NTREE_CHUNKSIZE_32, + "32", + 0, + "32" BLI_STR_UTF8_MULTIPLICATION_SIGN "32", + "Chunksize of 32" BLI_STR_UTF8_MULTIPLICATION_SIGN "32"}, + {NTREE_CHUNKSIZE_64, + "64", + 0, + "64" BLI_STR_UTF8_MULTIPLICATION_SIGN "64", + "Chunksize of 64" BLI_STR_UTF8_MULTIPLICATION_SIGN "64"}, + {NTREE_CHUNKSIZE_128, + "128", + 0, + "128" BLI_STR_UTF8_MULTIPLICATION_SIGN "128", + "Chunksize of 128" BLI_STR_UTF8_MULTIPLICATION_SIGN "128"}, + {NTREE_CHUNKSIZE_256, + "256", + 0, + "256" BLI_STR_UTF8_MULTIPLICATION_SIGN "256", + "Chunksize of 256" BLI_STR_UTF8_MULTIPLICATION_SIGN "256"}, + {NTREE_CHUNKSIZE_512, + "512", + 0, + "512" BLI_STR_UTF8_MULTIPLICATION_SIGN "512", + "Chunksize of 512" BLI_STR_UTF8_MULTIPLICATION_SIGN "512"}, + {NTREE_CHUNKSIZE_1024, + "1024", + 0, + "1024" BLI_STR_UTF8_MULTIPLICATION_SIGN "1024", + "Chunksize of 1024" BLI_STR_UTF8_MULTIPLICATION_SIGN "1024"}, {0, nullptr, 0, nullptr, nullptr}, }; #endif diff --git a/source/blender/makesrna/intern/rna_pose.cc b/source/blender/makesrna/intern/rna_pose.cc index 44609d70b79..d212c158f18 100644 --- a/source/blender/makesrna/intern/rna_pose.cc +++ b/source/blender/makesrna/intern/rna_pose.cc @@ -21,6 +21,7 @@ #include "DNA_scene_types.h" #include "BLI_math.h" +#include "BLI_string_utf8_symbols.h" #include "BLT_translation.h" @@ -1143,11 +1144,11 @@ static void rna_def_pose_channel(BlenderRNA *brna) RNA_def_property_float_sdna(prop, nullptr, "chan_mat"); RNA_def_property_multi_array(prop, 2, rna_matrix_dimsize_4x4); RNA_def_property_clear_flag(prop, PROP_EDITABLE); - RNA_def_property_ui_text( - prop, - "Channel Matrix", - "4\u00D74 matrix of the bone's location/rotation/scale channels (including " - "animation and drivers) and the effect of bone constraints"); + RNA_def_property_ui_text(prop, + "Channel Matrix", + "4" BLI_STR_UTF8_MULTIPLICATION_SIGN + "4 matrix of the bone's location/rotation/scale channels (including " + "animation and drivers) and the effect of bone constraints"); /* writable because it touches loc/scale/rot directly */ prop = RNA_def_property(srna, "matrix_basis", PROP_FLOAT, PROP_MATRIX); @@ -1166,10 +1167,11 @@ static void rna_def_pose_channel(BlenderRNA *brna) RNA_def_property_float_sdna(prop, nullptr, "pose_mat"); RNA_def_property_multi_array(prop, 2, rna_matrix_dimsize_4x4); RNA_def_property_float_funcs(prop, nullptr, "rna_PoseChannel_matrix_set", nullptr); - RNA_def_property_ui_text( - prop, - "Pose Matrix", - "Final 4\u00D74 matrix after constraints and drivers are applied, in the armature object space"); + RNA_def_property_ui_text(prop, + "Pose Matrix", + "Final 4" BLI_STR_UTF8_MULTIPLICATION_SIGN + "4 matrix after constraints and drivers are applied, in " + "the armature object space"); RNA_def_property_update(prop, NC_OBJECT | ND_POSE, "rna_Pose_update"); /* Head/Tail Coordinates (in Pose Space) - Automatically calculated... */ diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index c161f876734..8aab6aad746 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -27,6 +27,7 @@ #include "BLI_listbase.h" #include "BLI_math.h" +#include "BLI_string_utf8_symbols.h" #include "BLT_translation.h" @@ -6320,10 +6321,10 @@ static void rna_def_scene_render_data(BlenderRNA *brna) static const EnumPropertyItem pixel_size_items[] = { {0, "AUTO", 0, "Automatic", "Automatic pixel size, depends on the user interface scale"}, - {1, "1", 0, "1\u00D7", "Render at full resolution"}, - {2, "2", 0, "2\u00D7", "Render at 50% resolution"}, - {4, "4", 0, "4\u00D7", "Render at 25% resolution"}, - {8, "8", 0, "8\u00D7", "Render at 12.5% resolution"}, + {1, "1", 0, "1" BLI_STR_UTF8_MULTIPLICATION_SIGN, "Render at full resolution"}, + {2, "2", 0, "2" BLI_STR_UTF8_MULTIPLICATION_SIGN, "Render at 50% resolution"}, + {4, "4", 0, "4" BLI_STR_UTF8_MULTIPLICATION_SIGN, "Render at 25% resolution"}, + {8, "8", 0, "8" BLI_STR_UTF8_MULTIPLICATION_SIGN, "Render at 12.5% resolution"}, {0, NULL, 0, NULL, NULL}, }; diff --git a/source/blender/makesrna/intern/rna_sequencer.c b/source/blender/makesrna/intern/rna_sequencer.c index 7aee9554a9f..97eaf8928a9 100644 --- a/source/blender/makesrna/intern/rna_sequencer.c +++ b/source/blender/makesrna/intern/rna_sequencer.c @@ -19,6 +19,7 @@ #include "BLI_iterator.h" #include "BLI_listbase.h" #include "BLI_math.h" +#include "BLI_string_utf8_symbols.h" #include "BLI_string_utils.h" #include "BLT_translation.h" @@ -1649,8 +1650,8 @@ static const EnumPropertyItem transform_filter_items[] = { {SEQ_TRANSFORM_FILTER_NEAREST_3x3, "SUBSAMPLING_3x3", 0, - "Subsampling (3\u00D73)", - "Use nearest with 3\u00D73 subsamples during rendering"}, + "Subsampling (3" BLI_STR_UTF8_MULTIPLICATION_SIGN "3)", + "Use nearest with 3" BLI_STR_UTF8_MULTIPLICATION_SIGN "3 subsamples during rendering"}, {0, NULL, 0, NULL, NULL}, }; diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index 250f22ee0c3..1ae1dcb4467 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -18,6 +18,7 @@ #include "BLI_math_base.h" #include "BLI_math_rotation.h" +#include "BLI_string_utf8_symbols.h" #include "BLI_utildefines.h" #ifdef WIN32 # include "BLI_winstuff.h" @@ -5454,10 +5455,10 @@ static void rna_def_userdef_system(BlenderRNA *brna) static const EnumPropertyItem anisotropic_items[] = { {1, "FILTER_0", 0, "Off", ""}, - {2, "FILTER_2", 0, "2\u00D7", ""}, - {4, "FILTER_4", 0, "4\u00D7", ""}, - {8, "FILTER_8", 0, "8\u00D7", ""}, - {16, "FILTER_16", 0, "16\u00D7", ""}, + {2, "FILTER_2", 0, "2" BLI_STR_UTF8_MULTIPLICATION_SIGN, ""}, + {4, "FILTER_4", 0, "4" BLI_STR_UTF8_MULTIPLICATION_SIGN, ""}, + {8, "FILTER_8", 0, "8" BLI_STR_UTF8_MULTIPLICATION_SIGN, ""}, + {16, "FILTER_16", 0, "16" BLI_STR_UTF8_MULTIPLICATION_SIGN, ""}, {0, NULL, 0, NULL, NULL}, }; diff --git a/source/blender/makesrna/intern/rna_volume.c b/source/blender/makesrna/intern/rna_volume.c index 889fc2d0c31..fce232fa63b 100644 --- a/source/blender/makesrna/intern/rna_volume.c +++ b/source/blender/makesrna/intern/rna_volume.c @@ -20,6 +20,7 @@ #include "BKE_volume.h" #include "BLI_math_base.h" +#include "BLI_string_utf8_symbols.h" #include "BLT_translation.h" @@ -418,7 +419,7 @@ static void rna_def_volume_display(BlenderRNA *brna) "FINE", 0, "Fine", - "Display box for each leaf node containing 8\u00D78 voxels"}, + "Display box for each leaf node containing 8" BLI_STR_UTF8_MULTIPLICATION_SIGN "8 voxels"}, {0, NULL, 0, NULL, NULL}, }; -- 2.30.2