blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 746 Projects 19 Wiki Activity

UI: Consistent Range Descriptions 

Unifying range descriptions as a value 'to' a value.

Differential Revision: https://developer.blender.org/D9771

Reviewed by Julian Eisel
This commit is contained in:
Yevgeny Makarov 2020-12-11 07:35:44 -08:00 committed by Harley Acheson
parent 273aca964e
commit badbf816b8
13 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release/scripts/startup/bl_operators/object.py
View File

@ -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"

2
source/blender/editors/mesh/editmesh_tools.c
View File

@ -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",

2
source/blender/editors/sculpt_paint/paint_image.c
View File

@ -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);
}

2
source/blender/editors/space_clip/clip_ops.c
View File

@ -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);

2
source/blender/editors/uvedit/uvedit_ops.c
View File

@ -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);
}

2
source/blender/makesrna/intern/rna_constraint.c
View File

@ -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);

2
source/blender/makesrna/intern/rna_fluid.c
View File

@ -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 */

12
source/blender/makesrna/intern/rna_modifier.c
View File

@ -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},
};

10
source/blender/makesrna/intern/rna_nodetree.c
View File

@ -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");
}

2
source/blender/makesrna/intern/rna_particle.c
View File

@ -2948,7 +2948,7 @@ static void rna_def_particle_settings(BlenderRNA *brna)
prop,
"Adaptive Subframe Threshold",
"The relative distance a particle can move before requiring more subframes "
"(target Courant number); 0.01-0.3 is the recommended range");
"(target Courant number); 0.01 to 0.3 is the recommended range");
RNA_def_property_update(prop, 0, "rna_Particle_reset");
prop = RNA_def_property(srna, "jitter_factor", PROP_FLOAT, PROP_NONE);

9
source/blender/makesrna/intern/rna_pose.c
View File

@ -1551,14 +1551,13 @@ static void rna_def_pose_itasc(BlenderRNA *brna)
RNA_def_property_ui_text(
prop,
"Feedback",
"Feedback coefficient for error correction, average response time is 1/feedback "
"(default=20)");
"Feedback coefficient for error correction, average response time is 1/feedback");
RNA_def_property_update(prop, NC_OBJECT | ND_POSE, "rna_Itasc_update");
prop = RNA_def_property(srna, "velocity_max", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "maxvel");
RNA_def_property_range(prop, 0.0f, 100.0f);
RNA_def_property_ui_text(prop, "Max Velocity", "Maximum joint velocity in rad/s (default=50)");
RNA_def_property_ui_text(prop, "Max Velocity", "Maximum joint velocity in radians/second");
RNA_def_property_update(prop, NC_OBJECT | ND_POSE, "rna_Itasc_update");
prop = RNA_def_property(srna, "solver", PROP_ENUM, PROP_NONE);
@ -1574,7 +1573,7 @@ static void rna_def_pose_itasc(BlenderRNA *brna)
RNA_def_property_ui_text(prop,
"Damp",
"Maximum damping coefficient when singular value is nearly 0 "
"(higher values=more stability, less reactivity - default=0.5)");
"(higher values produce results with more stability, less reactivity)");
RNA_def_property_update(prop, NC_OBJECT | ND_POSE, "rna_Itasc_update");
prop = RNA_def_property(srna, "damping_epsilon", PROP_FLOAT, PROP_FACTOR);
@ -1583,7 +1582,7 @@ static void rna_def_pose_itasc(BlenderRNA *brna)
RNA_def_property_ui_text(prop,
"Epsilon",
"Singular value under which damping is progressively applied "
"(higher values=more stability, less reactivity - default=0.1)");
"(higher values produce results with more stability, less reactivity)");
RNA_def_property_update(prop, NC_OBJECT | ND_POSE, "rna_Itasc_update");
}

4
source/blender/makesrna/intern/rna_scene.c
View File

@ -4319,7 +4319,7 @@ void rna_def_view_layer_common(StructRNA *srna, const bool scene)
prop = RNA_def_property(srna, "use_pass_mist", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_MIST);
RNA_def_property_ui_text(prop, "Mist", "Deliver mist factor pass (0.0-1.0)");
RNA_def_property_ui_text(prop, "Mist", "Deliver mist factor pass (0.0 to 1.0)");
if (scene) {
RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_ViewLayer_pass_update");
}
@ -6366,7 +6366,7 @@ static void rna_def_scene_render_data(BlenderRNA *brna)
RNA_def_property_range(prop, 0.0, 1000.0);
RNA_def_property_ui_text(prop,
"Scale",
"Instead of automatically normalizing to 0..1, "
"Instead of automatically normalizing to the range 0 to 1, "
"apply a user scale to the derivative map");
/* stamp */

2
source/blender/makesrna/intern/rna_space.c
View File

@ -5491,7 +5491,7 @@ static void rna_def_space_graph(BlenderRNA *brna)
RNA_def_property_boolean_sdna(prop, NULL, "flag", SIPO_NORMALIZE);
RNA_def_property_ui_text(prop,
"Use Normalization",
"Display curves in normalized to -1..1 range, "
"Display curves in normalized range from -1 to 1, "
"for easier editing of multiple curves with different ranges");
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_GRAPH, NULL);