kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Minor UI messages fixes, and enabling i18n for all modifier_setError() error messages.

Browse Source
This commit is contained in:
Bastien Montagne 2012-03-17 14:27:46 +00:00
parent e4cc4b3e95
commit 1f6ae5e4fb
12 changed files with 34 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
release/scripts/startup/bl_operators/vertexpaint_dirt.py
View File

@ -156,19 +156,19 @@ class VertexPaintDirt(Operator):
)
clean_angle = FloatProperty(
name="Highlight Angle",
description="Less then 90 limits the angle used in the tonal range",
description="Less than 90 limits the angle used in the tonal range",
min=0.0, max=180.0,
default=180.0,
)
dirt_angle = FloatProperty(
name="Dirt Angle",
description="Less then 90 limits the angle used in the tonal range",
description="Less than 90 limits the angle used in the tonal range",
min=0.0, max=180.0,
default=0.0,
)
dirt_only = BoolProperty(
name="Dirt Only",
description="Dont calculate cleans for convex areas",
description="Don't calculate cleans for convex areas",
default=False,
)

2
release/scripts/startup/bl_ui/properties_object.py
View File

@ -90,7 +90,7 @@ class OBJECT_PT_delta_transform(ObjectButtonsPanel, Panel):
#row.column().prop(ob, "delta_rotation_axis_angle", text="Rotation")
row.column().label(text="Not for Axis-Angle")
else:
row.column().prop(ob, "delta_rotation_euler", text="Rotation")
row.column().prop(ob, "delta_rotation_euler", text="Delat Rotation")
row.column().prop(ob, "delta_scale")

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

@ -51,6 +51,8 @@
#include "BLI_utildefines.h"
#include "BLI_linklist.h"
#include "BLF_translation.h"
#include "BKE_cdderivedmesh.h"
#include "BKE_displist.h"
#include "BKE_key.h"
@ -1389,7 +1391,7 @@ static void mesh_calc_modifiers(Scene *scene, Object *ob, float (*inputVertexCos
if(!modifier_isEnabled(scene, md, required_mode)) continue;
if(mti->type == eModifierTypeType_OnlyDeform && !useDeform) continue;
if((mti->flags & eModifierTypeFlag_RequiresOriginalData) && dm) {
modifier_setError(md, "Modifier requires original data, bad stack position.");
modifier_setError(md, TIP_("Modifier requires original data, bad stack position."));
continue;
}
if(sculpt_mode && (!has_multires || multires_applied)) {
@ -1402,7 +1404,7 @@ static void mesh_calc_modifiers(Scene *scene, Object *ob, float (*inputVertexCos
unsupported|= multires_applied;
if(unsupported) {
modifier_setError(md, "Not supported in sculpt mode.");
modifier_setError(md, TIP_("Not supported in sculpt mode."));
continue;
}
}
@ -1731,7 +1733,7 @@ int editbmesh_modifier_is_enabled(Scene *scene, ModifierData *md, DerivedMesh *d
if(!modifier_isEnabled(scene, md, required_mode)) return 0;
if((mti->flags & eModifierTypeFlag_RequiresOriginalData) && dm) {
modifier_setError(md, "Modifier requires original data, bad stack position.");
modifier_setError(md, TIP_("Modifier requires original data, bad stack position."));
return 0;
}

10
source/blender/blenkernel/intern/cloth.c
View File

@ -41,6 +41,8 @@
#include "BLI_utildefines.h"
#include "BLI_linklist.h"
#include "BLF_translation.h"
#include "BKE_cdderivedmesh.h"
#include "BKE_cloth.h"
#include "BKE_effect.h"
@ -827,7 +829,7 @@ static int cloth_from_object(Object *ob, ClothModifierData *clmd, DerivedMesh *d
clmd->clothObject->edgehash = NULL;
}
else if (!clmd->clothObject) {
modifier_setError ( & ( clmd->modifier ), "Out of memory on allocating clmd->clothObject." );
modifier_setError(&(clmd->modifier), TIP_("Out of memory on allocating clmd->clothObject."));
return 0;
}
@ -892,7 +894,7 @@ static int cloth_from_object(Object *ob, ClothModifierData *clmd, DerivedMesh *d
if ( !cloth_build_springs ( clmd, dm ) )
{
cloth_free_modifier ( clmd );
modifier_setError ( & ( clmd->modifier ), "Can't build springs." );
modifier_setError(&(clmd->modifier), TIP_("Can't build springs."));
printf("cloth_free_modifier cloth_build_springs\n");
return 0;
}
@ -938,7 +940,7 @@ static void cloth_from_mesh ( ClothModifierData *clmd, DerivedMesh *dm )
if ( clmd->clothObject->verts == NULL )
{
cloth_free_modifier ( clmd );
modifier_setError ( & ( clmd->modifier ), "Out of memory on allocating clmd->clothObject->verts." );
modifier_setError(&(clmd->modifier), TIP_("Out of memory on allocating clmd->clothObject->verts."));
printf("cloth_free_modifier clmd->clothObject->verts\n");
return;
}
@ -949,7 +951,7 @@ static void cloth_from_mesh ( ClothModifierData *clmd, DerivedMesh *dm )
if ( clmd->clothObject->mfaces == NULL )
{
cloth_free_modifier ( clmd );
modifier_setError ( & ( clmd->modifier ), "Out of memory on allocating clmd->clothObject->mfaces." );
modifier_setError(&(clmd->modifier), TIP_("Out of memory on allocating clmd->clothObject->mfaces."));
printf("cloth_free_modifier clmd->clothObject->mfaces\n");
return;
}

4
source/blender/editors/armature/meshlaplacian.c
View File

@ -47,6 +47,8 @@
#include "BLI_memarena.h"
#include "BLI_string.h"
#include "BLF_translation.h"
#include "BKE_DerivedMesh.h"
#include "BKE_modifier.h"
#include "BKE_mesh.h"
@ -1714,7 +1716,7 @@ static void meshdeform_matrix_solve(MeshDeformModifierData *mmd, MeshDeformBind
}
}
else {
modifier_setError(&mmd->modifier, "Failed to find bind solution (increase precision?).");
modifier_setError(&mmd->modifier, TIP_("Failed to find bind solution (increase precision?)."));
error("Mesh Deform: failed to find bind solution.");
break;
}

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

@ -2935,7 +2935,7 @@ void CLIP_OT_frame_jump(wmOperatorType *ot)
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
/* properties */
RNA_def_enum(ot->srna, "position", position_items, 0, "Position", "Position to jumo to");
RNA_def_enum(ot->srna, "position", position_items, 0, "Position", "Position to jump to");
}
/********************** join tracks operator *********************/

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

@ -1962,7 +1962,7 @@ static void rna_def_mproperties(BlenderRNA *brna)
/* Float */
srna = RNA_def_struct(brna, "MeshFloatPropertyLayer", NULL);
RNA_def_struct_sdna(srna, "CustomDataLayer");
RNA_def_struct_ui_text(srna, "Mesh Float Property Layer", "User defined layer of floating pointer number values");
RNA_def_struct_ui_text(srna, "Mesh Float Property Layer", "User defined layer of floating point number values");
RNA_def_struct_path_func(srna, "rna_MeshFloatPropertyLayer_path");
prop = RNA_def_property(srna, "name", PROP_STRING, PROP_NONE);

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

@ -3529,7 +3529,7 @@ static void rna_def_scene_render_data(BlenderRNA *brna)
prop = RNA_def_property(srna, "use_color_unpremultiply", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "color_mgt_flag", R_COLOR_MANAGEMENT_PREDIVIDE);
RNA_def_property_ui_text(prop, "Color Unpremultipy", "For premultiplied alpha render output, do color space conversion on colors without alpha, to avoid fringing on light backgrounds");
RNA_def_property_ui_text(prop, "Color Unpremultiply", "For premultiplied alpha render output, do color space conversion on colors without alpha, to avoid fringing on light backgrounds");
RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL);
prop = RNA_def_property(srna, "use_file_extension", PROP_BOOLEAN, PROP_NONE);

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

@ -1991,7 +1991,7 @@ static void rna_def_userdef_theme_space_clip(BlenderRNA *brna)
prop = RNA_def_property(srna, "selected_marker", PROP_FLOAT, PROP_COLOR_GAMMA);
RNA_def_property_float_sdna(prop, NULL, "sel_marker");
RNA_def_property_array(prop, 3);
RNA_def_property_ui_text(prop, "Selected Marker", "Color of sleected marker");
RNA_def_property_ui_text(prop, "Selected Marker", "Color of selected marker");
RNA_def_property_update(prop, 0, "rna_userdef_update");
prop = RNA_def_property(srna, "disabled_marker", PROP_FLOAT, PROP_COLOR_GAMMA);

3
source/blender/modifiers/intern/MOD_boolean.c
View File

@ -38,6 +38,7 @@
#include "BLI_utildefines.h"
#include "BLF_translation.h"
#include "BKE_cdderivedmesh.h"
#include "BKE_modifier.h"
@ -155,7 +156,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
if(result)
return result;
else
modifier_setError(md, "Can't execute boolean operation.");
modifier_setError(md, TIP_("Can't execute boolean operation."));
}
return derivedData;

9
source/blender/modifiers/intern/MOD_decimate.c
View File

@ -38,6 +38,8 @@
#include "BLI_math.h"
#include "BLI_utildefines.h"
#include "BLF_translation.h"
#include "MEM_guardedalloc.h"
#include "BKE_mesh.h"
@ -96,8 +98,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *UNUSED(ob),
}
if(numTris<3) {
modifier_setError(md,
"Modifier requires more than 3 input faces (triangles).");
modifier_setError(md, TIP_("Modifier requires more than 3 input faces (triangles)."));
dm = CDDM_copy(dm);
return dm;
}
@ -172,12 +173,12 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *UNUSED(ob),
CDDM_calc_edges_tessface(result);
}
else
modifier_setError(md, "Out of memory.");
modifier_setError(md, TIP_("Out of memory."));
LOD_FreeDecimationData(&lod);
}
else
modifier_setError(md, "Non-manifold mesh as input.");
modifier_setError(md, TIP_("Non-manifold mesh as input."));
MEM_freeN(lod.vertex_buffer);
MEM_freeN(lod.vertex_normal_buffer);

9
source/blender/modifiers/intern/MOD_meshdeform.c
View File

@ -39,6 +39,7 @@
#include "BLI_math.h"
#include "BLI_utildefines.h"
#include "BLF_translation.h"
#include "BKE_cdderivedmesh.h"
#include "BKE_global.h"
@ -217,7 +218,7 @@ static void meshdeformModifier_do(
}
if(!cagedm) {
modifier_setError(md, "Can't get mesh from cage object.");
modifier_setError(md, TIP_("Can't get mesh from cage object."));
return;
}
@ -245,16 +246,16 @@ static void meshdeformModifier_do(
totcagevert= cagedm->getNumVerts(cagedm);
if(mmd->totvert != totvert) {
modifier_setError(md, "Verts changed from %d to %d.", mmd->totvert, totvert);
modifier_setError(md, TIP_("Verts changed from %d to %d."), mmd->totvert, totvert);
cagedm->release(cagedm);
return;
}
else if (mmd->totcagevert != totcagevert) {
modifier_setError(md, "Cage verts changed from %d to %d.", mmd->totcagevert, totcagevert);
modifier_setError(md, TIP_("Cage verts changed from %d to %d."), mmd->totcagevert, totcagevert);
cagedm->release(cagedm);
return;
} else if (mmd->bindcagecos == NULL) {
modifier_setError(md, "Bind data missing.");
modifier_setError(md, TIP_("Bind data missing."));
cagedm->release(cagedm);
return;
}