blender
/
blender
133
398
Fork 578
Code Issues 6.3k Pull Requests 745 Projects 19 Wiki Activity

Fix UI messages (own stupidness even :/ ).

This commit is contained in:
Bastien Montagne 2015-01-13 21:03:15 +01:00
parent 653c6f2edd
commit cfd2af0d48
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/object/object_data_transfer.c
View File

@ -643,7 +643,7 @@ void OBJECT_OT_datalayout_transfer(wmOperatorType *ot)
{
PropertyRNA *prop;
ot->name = "Transfer Mesh Datalayout";
ot->name = "Transfer Mesh Data Layout";
ot->description = "Transfer layout of data layer(s) from active to selected meshes";
ot->idname = "OBJECT_OT_datalayout_transfer";

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

@ -163,7 +163,7 @@ EnumPropertyItem DT_method_edge_items[] = {
{MREMAP_MODE_EDGE_POLY_NEAREST, "POLY_NEAREST", 0, "Nearest Face Edge",
"Copy from closest edge of closest face (using midpoints)"},
{MREMAP_MODE_EDGE_EDGEINTERP_VNORPROJ, "EDGEINTERP_VNORPROJ", 0, "Projected Edge Interpolated",
"Interpolate all source edges hit by the projection of dest one along its own normal (from vertices)"},
"Interpolate all source edges hit by the projection of destination one along its own normal (from vertices)"},
{0, NULL, 0, NULL, NULL}
};
@ -173,7 +173,7 @@ EnumPropertyItem DT_method_loop_items[] = {
{MREMAP_MODE_LOOP_NEAREST_LOOPNOR, "NEAREST_NORMAL", 0, "Nearest Corner And Best Matching Normal",
"Copy from nearest corner which has the best matching normal"},
{MREMAP_MODE_LOOP_NEAREST_POLYNOR, "NEAREST_POLYNOR", 0, "Nearest Corner And Best Matching Face Normal",
"Copy from nearest corner which has the face with the best matching normal to dest corner's face one"},
"Copy from nearest corner which has the face with the best matching normal to destination corner's face one"},
{MREMAP_MODE_LOOP_POLY_NEAREST, "NEAREST_POLY", 0, "Nearest Corner Of Nearest Face",
"Copy from nearest corner of nearest polygon"},
{MREMAP_MODE_LOOP_POLYINTERP_NEAREST, "POLYINTERP_NEAREST", 0, "Nearest Face Interpolated",
@ -189,9 +189,9 @@ EnumPropertyItem DT_method_poly_items[] = {
{MREMAP_MODE_POLY_NEAREST, "NEAREST", 0, "Nearest Face",
"Copy from nearest polygon (using center points)"},
{MREMAP_MODE_POLY_NOR, "NORMAL", 0, "Best Normal-Matching",
"Copy from source polygon which normal is the closest to dest one"},
"Copy from source polygon which normal is the closest to destination one"},
{MREMAP_MODE_POLY_POLYINTERP_PNORPROJ, "POLYINTERP_PNORPROJ", 0, "Projected Face Interpolated",
"Interpolate all source polygons intersected by the projection of dest one along its own normal"},
"Interpolate all source polygons intersected by the projection of destination one along its own normal"},
{0, NULL, 0, NULL, NULL}
};
@ -199,9 +199,9 @@ EnumPropertyItem DT_mix_mode_items[] = {
{CDT_MIX_TRANSFER, "REPLACE", 0, "Replace",
"Overwrite all elements' data"},
{CDT_MIX_REPLACE_ABOVE_THRESHOLD, "ABOVE_THRESHOLD", 0, "Above Threshold",
"Only replace dest elements where data is above given threshold (exact behavior depends on data type)"},
"Only replace destination elements where data is above given threshold (exact behavior depends on data type)"},
{CDT_MIX_REPLACE_BELOW_THRESHOLD, "BELOW_THRESHOLD", 0, "Below Threshold",
"Only replace dest elements where data is below given threshold (exact behavior depends on data type)"},
"Only replace destination elements where data is below given threshold (exact behavior depends on data type)"},
{CDT_MIX_MIX, "MIX", 0, "Mix",
"Mix source value into destination one, using given threshold as factor"},
{CDT_MIX_ADD, "ADD", 0, "Add",
@ -220,7 +220,7 @@ EnumPropertyItem DT_layers_select_src_items[] = {
{DT_LAYERS_ALL_SRC, "ALL", 0, "All Layers",
"Transfer all data layers"},
{DT_LAYERS_VGROUP_SRC_BONE_SELECT, "BONE_SELECT", 0, "Selected Pose Bones",
"Transfer all vertex groups used by selected posebones"},
"Transfer all vertex groups used by selected pose bones"},
{DT_LAYERS_VGROUP_SRC_BONE_DEFORM, "BONE_DEFORM", 0, "Deform Pose Bones",
"Transfer all vertex groups used by deform bones"},
{0, NULL, 0, NULL, NULL}

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

@ -3294,7 +3294,7 @@ static void rna_def_fileselect_params(BlenderRNA *brna)
prop = RNA_def_property(srna, "filter_search", PROP_STRING, PROP_NONE);
RNA_def_property_string_sdna(prop, NULL, "filter_search");
RNA_def_property_ui_text(prop, "Name Filter", "Filter by name, supports '*' wilcard");
RNA_def_property_ui_text(prop, "Name Filter", "Filter by name, supports '*' wildcard");
RNA_def_property_flag(prop, PROP_TEXTEDIT_UPDATE);
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_FILE_LIST, NULL);
}