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

Usual UI/i18n message fixes. 

Please provide valid description for SurfaceDeform modifier tooltip.
Such place-holders should not pass final checks before merging in master!
This commit is contained in:
Bastien Montagne 2017-03-19 17:31:07 +01:00
parent 19d493ee10
commit df76616d74
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1320,7 +1320,7 @@ class USERPREF_PT_addons(Panel):
if addon_utils.error_duplicates:
box = col.box()
row = box.row()
row.label("Multiple addons with the same name found!")
row.label("Multiple add-ons with the same name found!")
row.label(icon='ERROR')
box.label("Please delete one of each pair:")
for (addon_name, addon_file, addon_path) in addon_utils.error_duplicates:

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

@ -4717,7 +4717,7 @@ static void rna_def_modifier_surfacedeform(BlenderRNA *brna)
PropertyRNA *prop;
srna = RNA_def_struct(brna, "SurfaceDeformModifier", "Modifier");
RNA_def_struct_ui_text(srna, "SurfaceDeform Modifier", "blablabla");
RNA_def_struct_ui_text(srna, "SurfaceDeform Modifier", "");
RNA_def_struct_sdna(srna, "SurfaceDeformModifierData");
RNA_def_struct_ui_icon(srna, ICON_MOD_MESHDEFORM);

8
source/blender/modifiers/intern/MOD_surfacedeform.c
View File

@ -973,7 +973,7 @@ static bool surfacedeformBind(SurfaceDeformModifierData *smd, float (*vertexCos)
adj_result = buildAdjacencyMap(mpoly, medge, mloop, tnumpoly, tnumedges, vert_edges, adj_array, edge_polys);
if (adj_result == MOD_SDEF_BIND_RESULT_NONMANY_ERR) {
modifier_setError((ModifierData *)smd, "Target has edges with more than two polys");
modifier_setError((ModifierData *)smd, "Target has edges with more than two polygons");
freeAdjacencyMap(vert_edges, adj_array, edge_polys);
free_bvhtree_from_mesh(&treeData);
MEM_freeN(smd->verts);
@ -1019,11 +1019,11 @@ static bool surfacedeformBind(SurfaceDeformModifierData *smd, float (*vertexCos)
freeData((ModifierData *)smd);
}
else if (data.success == MOD_SDEF_BIND_RESULT_NONMANY_ERR) {
modifier_setError((ModifierData *)smd, "Target has edges with more than two polys");
modifier_setError((ModifierData *)smd, "Target has edges with more than two polygons");
freeData((ModifierData *)smd);
}
else if (data.success == MOD_SDEF_BIND_RESULT_CONCAVE_ERR) {
modifier_setError((ModifierData *)smd, "Target contains concave polys");
modifier_setError((ModifierData *)smd, "Target contains concave polygons");
freeData((ModifierData *)smd);
}
else if (data.success == MOD_SDEF_BIND_RESULT_OVERLAP_ERR) {
@ -1035,7 +1035,7 @@ static bool surfacedeformBind(SurfaceDeformModifierData *smd, float (*vertexCos)
* to explain this whith a reasonably sized message.
* Though it shouldn't really matter all that much,
* because this is very unlikely to occur */
modifier_setError((ModifierData *)smd, "Target contains invalid polys");
modifier_setError((ModifierData *)smd, "Target contains invalid polygons");
freeData((ModifierData *)smd);
}