Index: release/scripts/startup/bl_ui/properties_data_mesh.py =================================================================== --- release/scripts/startup/bl_ui/properties_data_mesh.py (revision 41999) +++ release/scripts/startup/bl_ui/properties_data_mesh.py (working copy) @@ -265,7 +265,7 @@ class DATA_PT_uv_texture(MeshButtonsPanel, Panel): - bl_label = "UV Texture" + bl_label = "UV Layer" COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} def draw(self, context): Index: source/blender/blenkernel/intern/customdata.c =================================================================== --- source/blender/blenkernel/intern/customdata.c (revision 41999) +++ source/blender/blenkernel/intern/customdata.c (working copy) @@ -818,7 +818,7 @@ /* 4: CD_MFACE */ {sizeof(MFace), "MFace", 1, NULL, NULL, NULL, NULL, NULL, NULL}, /* 5: CD_MTFACE */ - {sizeof(MTFace), "MTFace", 1, "UVTex", layerCopy_tface, NULL, + {sizeof(MTFace), "MTFace", 1, "UVLayer", layerCopy_tface, NULL, layerInterp_tface, layerSwap_tface, layerDefault_tface}, /* 6: CD_MCOL */ /* 4 MCol structs per face */ @@ -838,7 +838,7 @@ /* 12: CD_PROP_STR */ {sizeof(MStringProperty), "MStringProperty",1,"String",NULL,NULL,NULL,NULL}, /* 13: CD_ORIGSPACE */ - {sizeof(OrigSpaceFace), "OrigSpaceFace", 1, "UVTex", layerCopy_origspace_face, NULL, + {sizeof(OrigSpaceFace), "OrigSpaceFace", 1, "UVLayer", layerCopy_origspace_face, NULL, layerInterp_origspace_face, layerSwap_origspace_face, layerDefault_origspace_face}, /* 14: CD_ORCO */ {sizeof(float)*3, "", 0, NULL, NULL, NULL, NULL, NULL, NULL}, Index: source/blender/makesrna/intern/rna_mesh.c =================================================================== --- source/blender/makesrna/intern/rna_mesh.c (revision 41999) +++ source/blender/makesrna/intern/rna_mesh.c (working copy) @@ -1415,7 +1415,7 @@ prop= RNA_def_property(srna, "name", PROP_STRING, PROP_NONE); RNA_def_struct_name_property(srna, prop); RNA_def_property_string_funcs(prop, NULL, NULL, "rna_MeshTextureFaceLayer_name_set"); - RNA_def_property_ui_text(prop, "Name", "Name of UV unwrapping layer"); + RNA_def_property_ui_text(prop, "Name", "Name of UV layer"); RNA_def_property_update(prop, 0, "rna_Mesh_update_data"); prop= RNA_def_property(srna, "active", PROP_BOOLEAN, PROP_NONE); @@ -1870,7 +1870,7 @@ func= RNA_def_function(srna, "new", "rna_Mesh_uv_texture_new"); RNA_def_function_flag(func, FUNC_USE_CONTEXT); RNA_def_function_ui_description(func, "Add a UV texture layer to Mesh"); - RNA_def_string(func, "name", "UVTex", 0, "", "UV Texture name"); + RNA_def_string(func, "name", "UVLayer", 0, "", "UV Layer name"); parm= RNA_def_pointer(func, "layer", "MeshTextureFaceLayer", "", "The newly created layer"); RNA_def_function_return(func, parm); @@ -1885,13 +1885,13 @@ RNA_def_property_struct_type(prop, "MeshTextureFaceLayer"); RNA_def_property_pointer_funcs(prop, "rna_Mesh_active_uv_texture_get", "rna_Mesh_active_uv_texture_set", NULL, NULL); RNA_def_property_flag(prop, PROP_EDITABLE); - RNA_def_property_ui_text(prop, "Active UV Texture", "Active UV texture"); + RNA_def_property_ui_text(prop, "Active UV Layer", "Active UV Layer"); RNA_def_property_update(prop, 0, "rna_Mesh_update_data"); prop= RNA_def_property(srna, "active_index", PROP_INT, PROP_UNSIGNED); RNA_def_property_int_funcs(prop, "rna_Mesh_active_uv_texture_index_get", "rna_Mesh_active_uv_texture_index_set", "rna_Mesh_active_uv_texture_index_range"); - RNA_def_property_ui_text(prop, "Active UV Texture Index", "Active UV texture index"); + RNA_def_property_ui_text(prop, "Active UV layer Index", "Active UV layer index"); RNA_def_property_update(prop, 0, "rna_Mesh_update_data"); } Index: source/blender/blenloader/intern/readfile.c =================================================================== --- source/blender/blenloader/intern/readfile.c (revision 41999) +++ source/blender/blenloader/intern/readfile.c (working copy) @@ -6478,8 +6478,8 @@ if (layer->type == CD_MTFACE) { if (layer->name[0] == 0) { - if (mtfacen == 0) strcpy(layer->name, "UVTex"); - else sprintf(layer->name, "UVTex.%.3d", mtfacen); + if (mtfacen == 0) strcpy(layer->name, "UVLayer"); + else sprintf(layer->name, "UVLayer.%.3d", mtfacen); } mtfacen++; } Index: source/blender/editors/mesh/mesh_data.c =================================================================== --- source/blender/editors/mesh/mesh_data.c (revision 41999) +++ source/blender/editors/mesh/mesh_data.c (working copy) @@ -337,8 +337,8 @@ void MESH_OT_uv_texture_add(wmOperatorType *ot) { /* identifiers */ - ot->name= "Add UV Texture"; - ot->description= "Add UV texture layer"; + ot->name= "Add UV Layer"; + ot->description= "Add UV layer"; ot->idname= "MESH_OT_uv_texture_add"; /* api callbacks */ @@ -417,7 +417,7 @@ void MESH_OT_drop_named_image(wmOperatorType *ot) { /* identifiers */ - ot->name= "Assign Image to UV Texture"; + ot->name= "Assign Image to UV Layer"; ot->description= "Assigns Image to active UV layer, or creates a UV layer"; ot->idname= "MESH_OT_drop_named_image"; @@ -447,8 +447,8 @@ void MESH_OT_uv_texture_remove(wmOperatorType *ot) { /* identifiers */ - ot->name= "Remove UV Texture"; - ot->description= "Remove UV texture layer"; + ot->name= "Remove UV Layer"; + ot->description= "Remove UV layer"; ot->idname= "MESH_OT_uv_texture_remove"; /* api callbacks */