blender
/
blender
137
416
Fork 599
Code Issues 6.3k Pull Requests 773 Projects 19 Wiki Activity

Fix a bunch of UI string issues...

This commit is contained in:
Bastien Montagne 2014-01-15 10:40:28 +01:00
parent 054982d2dd
commit 6ba02681de
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
intern/cycles/blender/addon/properties.py
View File

@ -317,8 +317,8 @@ class CyclesRenderSettings(bpy.types.PropertyGroup):
cls.volume_step_size = FloatProperty(
name="Step Size",
description="Distance between volume shader samples when rendering the volume. "
"Lower values give more accurate and detailed results but also increased render time",
description="Distance between volume shader samples when rendering the volume "
"(lower values give more accurate and detailed results, but also increased render time)",
default=0.1,
min=0.0000001, max=100000.0
)
@ -326,7 +326,7 @@ class CyclesRenderSettings(bpy.types.PropertyGroup):
cls.volume_max_steps = IntProperty(
name="Max Steps",
description="Maximum number of steps through the volume before giving up, "
"to protect from extremely long render times with big objects or small step sizes",
"to avoid extremely long render times with big objects or small step sizes",
default=1024,
min=2, max=65536
)
@ -538,7 +538,7 @@ class CyclesMaterialSettings(bpy.types.PropertyGroup):
)
cls.homogeneous_volume = BoolProperty(
name="Homogeneous Volume",
description="When using volume rendering, assume volume has the same density everywhere"
description="When using volume rendering, assume volume has the same density everywhere "
"(not using any textures), for faster rendering",
default=False,
)

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

@ -557,7 +557,7 @@ class JoinUVs(Operator):
class MakeDupliFace(Operator):
"""Converts objects into dupli-face instanced"""
"""Convert objects into dupli-face instanced"""
bl_idname = "object.make_dupli_face"
bl_label = "Make Dupli-Face"
bl_options = {'REGISTER', 'UNDO'}

8
source/blender/blenkernel/intern/mesh_evaluate.c
View File

@ -656,7 +656,7 @@ void BKE_mesh_loop_tangents_ex(MVert *mverts, const int UNUSED(numVerts), MLoop
/* First check we do have a tris/quads only mesh. */
for (mp = mpolys, mp_index = 0; mp_index < numPolys; mp++, mp_index++) {
if (mp->totloop > 4) {
BKE_report(reports, RPT_ERROR, "Tangent space can only be computed for tris/quads, aborting...\n");
BKE_report(reports, RPT_ERROR, "Tangent space can only be computed for tris/quads, aborting");
return;
}
}
@ -681,7 +681,7 @@ void BKE_mesh_loop_tangents_ex(MVert *mverts, const int UNUSED(numVerts), MLoop
/* 0 if failed */
if (genTangSpaceDefault(&s_context) == false) {
BKE_report(reports, RPT_ERROR, "Mikktspace failed to generate tangents for this mesh!\n");
BKE_report(reports, RPT_ERROR, "Mikktspace failed to generate tangents for this mesh!");
}
}
@ -703,13 +703,13 @@ void BKE_mesh_loop_tangents(Mesh *mesh, const char *uvmap, float (*r_looptangent
loopuvs = CustomData_get_layer(&mesh->ldata, CD_MLOOPUV);
}
if (!loopuvs) {
BKE_reportf(reports, RPT_ERROR, "Tangent space computation needs an UVMap, \"%s\" not found, aborting.\n", uvmap);
BKE_reportf(reports, RPT_ERROR, "Tangent space computation needs an UVMap, \"%s\" not found, aborting", uvmap);
return;
}
loopnors = CustomData_get_layer(&mesh->ldata, CD_NORMAL);
if (!loopnors) {
BKE_report(reports, RPT_ERROR, "Tangent space computation needs loop normals, none found, aborting.\n");
BKE_report(reports, RPT_ERROR, "Tangent space computation needs loop normals, none found, aborting");
return;
}

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

@ -1012,7 +1012,7 @@ static void rna_def_font(BlenderRNA *UNUSED(brna), StructRNA *srna)
RNA_def_property_ui_text(prop, "Object Font",
"Use Objects as font characters (give font objects a common name "
"followed by the character they represent, eg. 'family_a', 'family_b', etc, "
"and set this to 'family_', turn on Vertex Duplication)");
"set this setting to 'family_', and turn on Vertex Duplication)");
RNA_def_property_update(prop, 0, "rna_Curve_update_data");
prop = RNA_def_property(srna, "body", PROP_STRING, PROP_NONE);

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

@ -2401,7 +2401,7 @@ static void rna_def_modifier_bevel(BlenderRNA *brna)
prop = RNA_def_property(srna, "profile", PROP_FLOAT, PROP_FACTOR);
RNA_def_property_range(prop, 0.0f, 1.0f);
RNA_def_property_ui_range(prop, 0.15f, 1.0f, 0.05, 2);
RNA_def_property_ui_text(prop, "Profile", "Controls profile shape (0.5 = round)");
RNA_def_property_ui_text(prop, "Profile", "The profile shape (0.5 = round)");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
}

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

@ -80,7 +80,7 @@ EnumPropertyItem rigidbody_constraint_type_items[] = {
/* mesh source for collision shape creation */
static EnumPropertyItem rigidbody_mesh_source_items[] = {
{RBO_MESH_BASE, "BASE", 0, "Base", "Base mesh"},
{RBO_MESH_DEFORM, "DEFORM", 0, "Deform", "Deformations (shaps keys, deform modifiers"},
{RBO_MESH_DEFORM, "DEFORM", 0, "Deform", "Deformations (shape keys, deform modifiers)"},
{RBO_MESH_FINAL, "FINAL", 0, "Final", "All modifiers"},
{0, NULL, 0, NULL, NULL}};
#endif