[Bf-blender-cvs] [badbf816b86] master: UI: Consistent Range Descriptions
Yevgeny Makarov
noreply at git.blender.org
Fri Dec 11 17:02:52 CET 2020
Commit: badbf816b867ffeb5920a1575d0159ec516b2819
Author: Yevgeny Makarov
Date: Fri Dec 11 07:35:44 2020 -0800
Branches: master
https://developer.blender.org/rBbadbf816b867ffeb5920a1575d0159ec516b2819
UI: Consistent Range Descriptions
Unifying range descriptions as a value 'to' a value.
Differential Revision: https://developer.blender.org/D9771
Reviewed by Julian Eisel
===================================================================
M release/scripts/startup/bl_operators/object.py
M source/blender/editors/mesh/editmesh_tools.c
M source/blender/editors/sculpt_paint/paint_image.c
M source/blender/editors/space_clip/clip_ops.c
M source/blender/editors/uvedit/uvedit_ops.c
M source/blender/makesrna/intern/rna_constraint.c
M source/blender/makesrna/intern/rna_fluid.c
M source/blender/makesrna/intern/rna_modifier.c
M source/blender/makesrna/intern/rna_nodetree.c
M source/blender/makesrna/intern/rna_particle.c
M source/blender/makesrna/intern/rna_pose.c
M source/blender/makesrna/intern/rna_scene.c
M source/blender/makesrna/intern/rna_space.c
===================================================================
diff --git a/release/scripts/startup/bl_operators/object.py b/release/scripts/startup/bl_operators/object.py
index 87973ac2c45..0f5785c7498 100644
--- a/release/scripts/startup/bl_operators/object.py
+++ b/release/scripts/startup/bl_operators/object.py
@@ -223,7 +223,7 @@ class SelectHierarchy(Operator):
class SubdivisionSet(Operator):
- """Sets a Subdivision Surface Level (1-5)"""
+ """Sets a Subdivision Surface level (1 to 5)"""
bl_idname = "object.subdivision_set"
bl_label = "Subdivision Set"
diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c
index ccc27ec19b6..cf01170dd8a 100644
--- a/source/blender/editors/mesh/editmesh_tools.c
+++ b/source/blender/editors/mesh/editmesh_tools.c
@@ -180,7 +180,7 @@ void MESH_OT_subdivide(wmOperatorType *ot)
"ngon",
true,
"Create N-Gons",
- "When disabled, newly created faces are limited to 3-4 sided faces");
+ "When disabled, newly created faces are limited to 3 and 4 sided faces");
RNA_def_enum(
ot->srna,
"quadcorner",
diff --git a/source/blender/editors/sculpt_paint/paint_image.c b/source/blender/editors/sculpt_paint/paint_image.c
index 3a6b91443a0..999d364a3cd 100644
--- a/source/blender/editors/sculpt_paint/paint_image.c
+++ b/source/blender/editors/sculpt_paint/paint_image.c
@@ -934,7 +934,7 @@ void PAINT_OT_grab_clone(wmOperatorType *ot)
-FLT_MAX,
FLT_MAX,
"Delta",
- "Delta offset of clone image in 0.0..1.0 coordinates",
+ "Delta offset of clone image in 0.0 to 1.0 coordinates",
-1.0f,
1.0f);
}
diff --git a/source/blender/editors/space_clip/clip_ops.c b/source/blender/editors/space_clip/clip_ops.c
index 3f00e3114a5..8f36ccb019a 100644
--- a/source/blender/editors/space_clip/clip_ops.c
+++ b/source/blender/editors/space_clip/clip_ops.c
@@ -859,7 +859,7 @@ void CLIP_OT_view_zoom_out(wmOperatorType *ot)
-FLT_MAX,
FLT_MAX,
"Location",
- "Cursor location in normalized (0.0-1.0) coordinates",
+ "Cursor location in normalized (0.0 to 1.0) coordinates",
-10.0f,
10.0f);
RNA_def_property_flag(prop, PROP_HIDDEN);
diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c
index 5b3d858329a..aac5b96f737 100644
--- a/source/blender/editors/uvedit/uvedit_ops.c
+++ b/source/blender/editors/uvedit/uvedit_ops.c
@@ -1812,7 +1812,7 @@ static void UV_OT_cursor_set(wmOperatorType *ot)
-FLT_MAX,
FLT_MAX,
"Location",
- "Cursor location in normalized (0.0-1.0) coordinates",
+ "Cursor location in normalized (0.0 to 1.0) coordinates",
-10.0f,
10.0f);
}
diff --git a/source/blender/makesrna/intern/rna_constraint.c b/source/blender/makesrna/intern/rna_constraint.c
index 0b3dc2a3504..0f34ba47165 100644
--- a/source/blender/makesrna/intern/rna_constraint.c
+++ b/source/blender/makesrna/intern/rna_constraint.c
@@ -1051,7 +1051,7 @@ static void rna_def_constraint_python(BlenderRNA *brna)
prop = RNA_def_property(srna, "target_count", PROP_INT, PROP_NONE);
RNA_def_property_int_sdna(prop, NULL, "tarnum");
- RNA_def_property_ui_text(prop, "Number of Targets", "Usually only 1-3 are needed");
+ RNA_def_property_ui_text(prop, "Number of Targets", "Usually only 1 to 3 are needed");
RNA_def_property_update(prop, NC_OBJECT | ND_CONSTRAINT, "rna_Constraint_dependency_update");
prop = RNA_def_property(srna, "text", PROP_POINTER, PROP_NONE);
diff --git a/source/blender/makesrna/intern/rna_fluid.c b/source/blender/makesrna/intern/rna_fluid.c
index 90f5434bea0..bb8280ede91 100644
--- a/source/blender/makesrna/intern/rna_fluid.c
+++ b/source/blender/makesrna/intern/rna_fluid.c
@@ -1552,7 +1552,7 @@ static void rna_def_fluid_domain_settings(BlenderRNA *brna)
RNA_def_property_dynamic_array_funcs(prop, "rna_FluidModifier_grid_get_length");
RNA_def_property_float_funcs(prop, "rna_FluidModifier_temperature_grid_get", NULL, NULL);
RNA_def_property_ui_text(
- prop, "Temperature Grid", "Smoke temperature grid, range 0..1 represents 0..1000K");
+ prop, "Temperature Grid", "Smoke temperature grid, range 0 to 1 represents 0 to 1000K");
# endif /* WITH_FLUID */
/* domain object data */
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c
index d91b6ea19f7..80c2cbfb3ad 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -4884,13 +4884,13 @@ static void rna_def_modifier_screw(BlenderRNA *brna)
prop = RNA_def_property(srna, "use_stretch_u", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_SCREW_UV_STRETCH_U);
RNA_def_property_ui_text(
- prop, "Stretch U", "Stretch the U coordinates between 0-1 when UV's are present");
+ prop, "Stretch U", "Stretch the U coordinates between 0 and 1 when UV's are present");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
prop = RNA_def_property(srna, "use_stretch_v", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_SCREW_UV_STRETCH_V);
RNA_def_property_ui_text(
- prop, "Stretch V", "Stretch the V coordinates between 0-1 when UV's are present");
+ prop, "Stretch V", "Stretch the V coordinates between 0 and 1 when UV's are present");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
# if 0
@@ -5135,7 +5135,7 @@ static void rna_def_modifier_weightvgedit(BlenderRNA *brna)
RNA_def_property_ui_text(
prop,
"Normalize Weights",
- "Normalize the resulting weights (otherwise they are only clamped within [0.0, 1.0] range)");
+ "Normalize the resulting weights (otherwise they are only clamped within 0.0 to 1.0 range)");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
prop = RNA_def_property(srna, "map_curve", PROP_POINTER, PROP_NONE);
@@ -5300,7 +5300,7 @@ static void rna_def_modifier_weightvgmix(BlenderRNA *brna)
RNA_def_property_ui_text(
prop,
"Normalize Weights",
- "Normalize the resulting weights (otherwise they are only clamped within [0.0, 1.0] range)");
+ "Normalize the resulting weights (otherwise they are only clamped within 0.0 to 1.0 range)");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
RNA_define_lib_overridable(false);
@@ -5424,7 +5424,7 @@ static void rna_def_modifier_weightvgproximity(BlenderRNA *brna)
RNA_def_property_ui_text(
prop,
"Normalize Weights",
- "Normalize the resulting weights (otherwise they are only clamped within [0.0, 1.0] range)");
+ "Normalize the resulting weights (otherwise they are only clamped within 0.0 to 1.0 range)");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
prop = RNA_def_property(srna, "map_curve", PROP_POINTER, PROP_NONE);
@@ -5973,7 +5973,7 @@ static void rna_def_modifier_meshcache(BlenderRNA *brna)
"FACTOR",
0,
"Factor",
- "Control playback using a value between [0, 1]"},
+ "Control playback using a value between 0 and 1"},
{0, NULL, 0, NULL, NULL},
};
diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c
index 074269e4d41..6830c1a38c2 100644
--- a/source/blender/makesrna/intern/rna_nodetree.c
+++ b/source/blender/makesrna/intern/rna_nodetree.c
@@ -4306,7 +4306,7 @@ static void def_math(StructRNA *srna)
prop = RNA_def_property(srna, "use_clamp", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "custom2", SHD_MATH_CLAMP);
- RNA_def_property_ui_text(prop, "Clamp", "Clamp result of the node to 0..1 range");
+ RNA_def_property_ui_text(prop, "Clamp", "Clamp result of the node to 0.0 to 1.0 range");
RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
}
@@ -4425,7 +4425,7 @@ static void def_mix_rgb(StructRNA *srna)
prop = RNA_def_property(srna, "use_clamp", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "custom2", SHD_MIXRGB_CLAMP);
- RNA_def_property_ui_text(prop, "Clamp", "Clamp result of the node to 0..1 range");
+ RNA_def_property_ui_text(prop, "Clamp", "Clamp result of the node to 0.0 to 1.0 range");
RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
}
@@ -5177,12 +5177,12 @@ static void def_sh_tex_pointdensity(StructRNA *srna)
"PARTICLE_AGE",
0,
"Particle Age",
- "Lifetime mapped as 0.0 - 1.0 intensity"},
+ "Lifetime mapped as 0.0 to 1.0 intensity"},
{SHD_POINTDENSITY_COLOR_PARTSPEED,
"PARTICLE_SPEED",
0,
"Particle Speed",
- "Particle speed (absolute magnitude of velocity) mapped as 0.0-1.0 intensity"},
+ "Particle speed (absolute magnitude of velocity) mapped as 0.0 to 1.0 intensity"},
{SHD_POINTDENSITY_COLOR_PARTVEL,
"PARTICLE_VELOCITY",
0,
@@ -5937,7 +5937,7 @@ static void def_cmp_map_range(StructRNA *srna)
prop = RNA_def_property(srna, "use_clamp", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "custom1", 1);
- RNA_def_property_ui_text(prop, "Clamp", "Clamp result of the node to 0..1 range");
+ RNA_def_property_ui_text(prop, "Clamp", "Clamp result of the node to 0.0 to 1.0 range");
RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
}
diff --git a/source/blender/makesrna/intern/rna_particle.c b/source/blender/makesrna/intern/rna_particle.c
index e04ef105071..5fa93ec3f04 100644
--- a/source/blender/makesrna/intern/rna_particle.c
+++ b/source/blender/makesrna/intern/rna_particle.c
@@ -2948,7 +2948,7 @@ static void rna_def_particle_settings(BlenderRNA *brna)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list