Fix T51771: UI Messages: Reserve 'Normal' to its geometric meaning.
authorBastien Montagne <montagne29@wanadoo.fr>
Tue, 12 Feb 2019 20:28:04 +0000 (21:28 +0100)
committerBastien Montagne <montagne29@wanadoo.fr>
Tue, 12 Feb 2019 20:34:21 +0000 (21:34 +0100)
Using 'Regular' instead for the common meaning, this avoids having to
add some i18n context disambiguation...

source/blender/editors/sculpt_paint/paint_utils.c
source/blender/editors/sculpt_paint/sculpt_uv.c
source/blender/editors/transform/transform_gizmo_extrude_3d.c
source/blender/makesrna/intern/rna_gpencil.c
source/blender/makesrna/intern/rna_gpencil_modifier.c
source/blender/makesrna/intern/rna_mesh.c
source/blender/makesrna/intern/rna_modifier.c
source/blender/makesrna/intern/rna_shader_fx.c
source/blender/makesrna/intern/rna_space.c
source/blender/makesrna/intern/rna_ui.c
source/blender/makesrna/intern/rna_userdef.c

index 82b4046..8f5c044 100644 (file)
@@ -208,7 +208,7 @@ void paint_get_tex_pixel_col(
 void paint_stroke_operator_properties(wmOperatorType *ot)
 {
        static const EnumPropertyItem stroke_mode_items[] = {
-               {BRUSH_STROKE_NORMAL, "NORMAL", 0, "Normal", "Apply brush normally"},
+               {BRUSH_STROKE_NORMAL, "NORMAL", 0, "Regular", "Apply brush normally"},
                {BRUSH_STROKE_INVERT, "INVERT", 0, "Invert", "Invert action of brush for duration of stroke"},
                {BRUSH_STROKE_SMOOTH, "SMOOTH", 0, "Smooth", "Switch brush to smooth mode for duration of stroke"},
                {0},
index bc283b1..02168dc 100644 (file)
@@ -901,7 +901,7 @@ static int uv_sculpt_stroke_modal(bContext *C, wmOperator *op, const wmEvent *ev
 void SCULPT_OT_uv_sculpt_stroke(wmOperatorType *ot)
 {
        static const EnumPropertyItem stroke_mode_items[] = {
-               {BRUSH_STROKE_NORMAL, "NORMAL", 0, "Normal", "Apply brush normally"},
+               {BRUSH_STROKE_NORMAL, "NORMAL", 0, "Regular", "Apply brush normally"},
                {BRUSH_STROKE_INVERT, "INVERT", 0, "Invert", "Invert action of brush for duration of stroke"},
                {BRUSH_STROKE_SMOOTH, "RELAX", 0, "Relax", "Switch brush to relax mode for duration of stroke"},
                {0},
index ea5c02f..e81db9d 100644 (file)
@@ -457,7 +457,7 @@ void VIEW3D_GGT_xform_extrude(struct wmGizmoGroupType *gzgt)
        gzgt->message_subscribe = gizmo_mesh_extrude_message_subscribe;
 
        static const EnumPropertyItem axis_type_items[] = {
-               {EXTRUDE_AXIS_NORMAL, "NORMAL", 0, "Normal", "Only show normal axis"},
+               {EXTRUDE_AXIS_NORMAL, "NORMAL", 0, "Regular", "Only show normal axis"},
                {EXTRUDE_AXIS_XYZ, "XYZ", 0, "XYZ", "Follow scene orientation"},
                {0, NULL, 0, NULL, NULL},
        };
index 92a2e33..e91c052 100644 (file)
@@ -71,7 +71,7 @@ static const EnumPropertyItem rna_enum_gplayer_move_type_items[] = {
 };
 
 static const EnumPropertyItem rna_enum_layer_blend_modes_items[] = {
-       {eGplBlendMode_Normal, "NORMAL", 0, "Normal", "" },
+       {eGplBlendMode_Normal, "NORMAL", 0, "Regular", "" },
        {eGplBlendMode_Overlay, "OVERLAY", 0, "Overlay", "" },
        {eGplBlendMode_Add, "ADD", 0, "Add", "" },
        {eGplBlendMode_Subtract, "SUBTRACT", 0, "Subtract", "" },
index 2bf9487..c198699 100644 (file)
@@ -99,7 +99,7 @@ static const EnumPropertyItem modifier_gphook_falloff_items[] = {
 };
 
 static const EnumPropertyItem rna_enum_time_mode_items[] = {
-       {GP_TIME_MODE_NORMAL, "NORMAL", 0, "Normal", "Apply offset in normal animation direction"},
+       {GP_TIME_MODE_NORMAL, "NORMAL", 0, "Regular", "Apply offset in usual animation direction"},
        {GP_TIME_MODE_REVERSE, "REVERSE", 0, "Reverse", "Apply offset in reverse animation direction"},
        {GP_TIME_MODE_FIX, "FIX", 0, "Fixed Frame", "Keep frame and do not change with time"},
        {0, NULL, 0, NULL, NULL},
index 0333a54..d5b5270 100644 (file)
@@ -46,7 +46,7 @@
 #include "WM_types.h"
 
 const EnumPropertyItem rna_enum_mesh_delimit_mode_items[] = {
-       {BMO_DELIM_NORMAL, "NORMAL", 0, "Normal", "Delimit by face directions"},
+       {BMO_DELIM_NORMAL, "NORMAL", 0, "Regular", "Delimit by face directions"},
        {BMO_DELIM_MATERIAL, "MATERIAL", 0, "Material", "Delimit by face material"},
        {BMO_DELIM_SEAM, "SEAM", 0, "Seam", "Delimit by edge seams"},
        {BMO_DELIM_SHARP, "SHARP", 0, "Sharp", "Delimit by sharp edges"},
index 87283ef..34c6bc8 100644 (file)
@@ -2748,7 +2748,7 @@ static void rna_def_modifier_particleinstance(BlenderRNA *brna)
 
        prop = RNA_def_property(srna, "use_normal", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "flag", eParticleInstanceFlag_Parents);
-       RNA_def_property_ui_text(prop, "Normal", "Create instances from normal particles");
+       RNA_def_property_ui_text(prop, "Regular", "Create instances from normal particles");
        RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
        prop = RNA_def_property(srna, "use_children", PROP_BOOLEAN, PROP_NONE);
index 664e17a..62c1ea6 100644 (file)
@@ -58,7 +58,7 @@ const EnumPropertyItem rna_enum_object_shaderfx_type_items[] = {
 };
 
 static const EnumPropertyItem rna_enum_shaderfx_rim_modes_items[] = {
-       {eShaderFxRimMode_Normal, "NORMAL", 0, "Normal", "" },
+       {eShaderFxRimMode_Normal, "NORMAL", 0, "Regular", "" },
        {eShaderFxRimMode_Overlay, "OVERLAY", 0, "Overlay", "" },
        {eShaderFxRimMode_Add, "ADD", 0, "Add", "" },
        {eShaderFxRimMode_Subtract, "SUBTRACT", 0, "Subtract", "" },
index e9920f4..d36a27b 100644 (file)
@@ -4347,7 +4347,7 @@ static void rna_def_fileselect_params(BlenderRNA *brna)
        static const EnumPropertyItem display_size_items[] = {
            {32,    "TINY",     0,      "Tiny", ""},
            {64,    "SMALL",    0,      "Small", ""},
-           {128,   "NORMAL",   0,      "Normal", ""},
+           {128,   "NORMAL",   0,      "Regular", ""},
            {256,   "LARGE",    0,      "Large", ""},
            {0, NULL, 0, NULL, NULL},
        };
index 6006bc8..e95f537 100644 (file)
@@ -1039,7 +1039,7 @@ static void rna_def_ui_layout(BlenderRNA *brna)
        };
 
        static const EnumPropertyItem emboss_items[] = {
-               {UI_EMBOSS, "NORMAL", 0, "Normal", "Draw standard button emboss style"},
+               {UI_EMBOSS, "NORMAL", 0, "Regular", "Draw standard button emboss style"},
                {UI_EMBOSS_NONE, "NONE", 0, "None", "Draw only text and icons"},
                {UI_EMBOSS_PULLDOWN, "PULLDOWN_MENU", 0, "Pulldown Menu", "Draw pulldown menu style"},
                {UI_EMBOSS_RADIAL, "RADIAL_MENU", 0, "Radial Menu", "Draw radial menu style"},
index 8122ffe..d3986dd 100644 (file)
@@ -3053,7 +3053,7 @@ static void rna_def_userdef_theme_colorset(BlenderRNA *brna)
        prop = RNA_def_property(srna, "normal", PROP_FLOAT, PROP_COLOR_GAMMA);
        RNA_def_property_float_sdna(prop, NULL, "solid");
        RNA_def_property_array(prop, 3);
-       RNA_def_property_ui_text(prop, "Normal", "Color used for the surface of bones");
+       RNA_def_property_ui_text(prop, "Regular", "Color used for the surface of bones");
        RNA_def_property_update(prop, 0, "rna_userdef_update");
 
        prop = RNA_def_property(srna, "select", PROP_FLOAT, PROP_COLOR_GAMMA);