Index: release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py =================================================================== --- release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py (revision 42026) +++ release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py (working copy) @@ -242,7 +242,7 @@ # image format outputs if surface.surface_format == 'IMAGE': layout.operator("dpaint.bake", text="Bake Image Sequence", icon='MOD_DYNAMICPAINT') - layout.prop_search(surface, "uv_layer", ob.data, "uv_textures", text="UV layer:") + layout.prop_search(surface, "uv_layer", ob.data, "uv_textures", text="UV map:") layout.separator() layout.prop(surface, "image_output_path", text="") @@ -300,7 +300,7 @@ elif surface.init_color_type == 'TEXTURE': layout.prop(surface, "init_texture") - layout.prop_search(surface, "init_layername", ob.data, "uv_textures", text="UV Layer:") + layout.prop_search(surface, "init_layername", ob.data, "uv_textures", text="UV Map:") elif surface.init_color_type == 'VERTEX_COLOR': layout.prop_search(surface, "init_layername", ob.data, "vertex_colors", text="Color Layer: ") Index: release/scripts/startup/bl_ui/properties_data_modifier.py =================================================================== --- release/scripts/startup/bl_ui/properties_data_modifier.py (revision 42026) +++ release/scripts/startup/bl_ui/properties_data_modifier.py (working copy) @@ -692,7 +692,7 @@ col.prop(md, "image", text="") col = split.column() - col.label(text="UV Layer:") + col.label(text="UV Map:") col.prop_search(md, "uv_layer", ob.data, "uv_textures", text="") split = layout.split() Index: release/scripts/startup/bl_ui/properties_texture.py =================================================================== --- release/scripts/startup/bl_ui/properties_texture.py (revision 42026) +++ release/scripts/startup/bl_ui/properties_texture.py (working copy) @@ -831,7 +831,7 @@ """ elif tex.texture_coords == 'UV': split = layout.split(percentage=0.3) - split.label(text="Layer:") + split.label(text="Map:") ob = context.object if ob and ob.type == 'MESH': split.prop_search(tex, "uv_layer", ob.data, "uv_textures", text="") Index: release/scripts/startup/bl_ui/properties_data_mesh.py =================================================================== --- release/scripts/startup/bl_ui/properties_data_mesh.py (revision 42026) +++ 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 Map" COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} def draw(self, context): Index: release/scripts/startup/bl_operators/uvcalc_lightmap.py =================================================================== --- release/scripts/startup/bl_operators/uvcalc_lightmap.py (revision 42026) +++ release/scripts/startup/bl_operators/uvcalc_lightmap.py (working copy) @@ -566,8 +566,8 @@ default=True, ) PREF_NEW_UVLAYER = BoolProperty( - name="New UV Layer", - description="Create a new UV layer for every mesh packed", + name="New UV Map", + description="Create a new UV map for every mesh packed", default=False, ) PREF_APPLY_IMAGE = BoolProperty( Index: intern/cycles/blender/blender_mesh.cpp =================================================================== --- intern/cycles/blender/blender_mesh.cpp (revision 42026) +++ intern/cycles/blender/blender_mesh.cpp (working copy) @@ -144,7 +144,7 @@ } } - /* create uv layer attributes */ + /* create uv map attributes */ { BL::Mesh::uv_textures_iterator l; Index: source/blender/blenkernel/intern/dynamicpaint.c =================================================================== --- source/blender/blenkernel/intern/dynamicpaint.c (revision 42026) +++ source/blender/blenkernel/intern/dynamicpaint.c (working copy) @@ -1307,7 +1307,7 @@ if (!tex) return; - /* get uv layer */ + /* get uv map */ CustomData_validate_layer_name(&dm->faceData, CD_MTFACE, surface->init_layername, uvname); tface = CustomData_get_layer_named(&dm->faceData, CD_MTFACE, uvname); if (!tface) return; @@ -2094,7 +2094,7 @@ numOfFaces = dm->getNumFaces(dm); mface = dm->getFaceArray(dm); - /* get uv layer */ + /* get uv map */ CustomData_validate_layer_name(&dm->faceData, CD_MTFACE, surface->uvlayer_name, uvname); tface = CustomData_get_layer_named(&dm->faceData, CD_MTFACE, uvname); Index: source/blender/blenkernel/intern/customdata.c =================================================================== --- source/blender/blenkernel/intern/customdata.c (revision 42026) +++ 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, "UVMap", 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, "UVMap", 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/nodes/shader/nodes/node_shader_geom.c =================================================================== --- source/blender/nodes/shader/nodes/node_shader_geom.c (revision 42026) +++ source/blender/nodes/shader/nodes/node_shader_geom.c (working copy) @@ -61,7 +61,7 @@ int i; if(ngeo->uvname[0]) { - /* find uv layer by name */ + /* find uv map by name */ for(i = 0; i < shi->totuv; i++) { if(strcmp(shi->uv[i].name, ngeo->uvname)==0) { suv= &shi->uv[i]; Index: source/blender/render/intern/source/render_texture.c =================================================================== --- source/blender/render/intern/source/render_texture.c (revision 42026) +++ source/blender/render/intern/source/render_texture.c (working copy) @@ -3684,7 +3684,7 @@ int i, layers = CustomData_number_of_layers(&orcoDm->faceData, CD_MTFACE); int layer_index = CustomData_get_layer_index(&orcoDm->faceData, CD_MTFACE); - /* for every uv layer set coords and name */ + /* for every uv map set coords and name */ for (i=0; i= 0) { float *uv1, *uv2, *uv3; @@ -3708,7 +3708,7 @@ shi.uv[i].uv[2]= 0.0f; /* texture.c assumes there are 3 coords */ } } - /* active uv layer */ + /* active uv map */ shi.actuv = CustomData_get_active_layer_index(&orcoDm->faceData,CD_MTFACE) - layer_index; shi.totuv = layers; } Index: source/blender/modifiers/intern/MOD_uvproject.c =================================================================== --- source/blender/modifiers/intern/MOD_uvproject.c (revision 42026) +++ source/blender/modifiers/intern/MOD_uvproject.c (working copy) @@ -170,7 +170,7 @@ if(num_projectors == 0) return dm; - /* make sure there are UV layers available */ + /* make sure there are UV Maps available */ if(!CustomData_has_layer(&dm->faceData, CD_MTFACE)) return dm; @@ -259,7 +259,7 @@ mul_mat3_m4_v3(projectors[i].ob->obmat, projectors[i].normal); } - /* make sure we are not modifying the original UV layer */ + /* make sure we are not modifying the original UV map */ tface = CustomData_duplicate_referenced_layer_named(&dm->faceData, CD_MTFACE, uvname); Index: source/blender/makesdna/DNA_modifier_types.h =================================================================== --- source/blender/makesdna/DNA_modifier_types.h (revision 42026) +++ source/blender/makesdna/DNA_modifier_types.h (working copy) @@ -878,7 +878,7 @@ struct Object *mask_tex_map_obj; /* Name of the map object. */ /* How to map the texture (using MOD_DISP_MAP_* constants). */ int mask_tex_mapping; - char mask_tex_uvlayer_name[32]; /* Name of the UV layer. */ + char mask_tex_uvlayer_name[32]; /* Name of the UV map. */ /* Padding... */ int pad_i1; @@ -923,7 +923,7 @@ struct Tex *mask_texture; /* The texture. */ struct Object *mask_tex_map_obj; /* Name of the map object. */ int mask_tex_mapping; /* How to map the texture! */ - char mask_tex_uvlayer_name[32]; /* Name of the UV layer. */ + char mask_tex_uvlayer_name[32]; /* Name of the UV map. */ /* Padding... */ int pad_i1; @@ -970,7 +970,7 @@ struct Tex *mask_texture; /* The texture. */ struct Object *mask_tex_map_obj; /* Name of the map object. */ int mask_tex_mapping; /* How to map the texture! */ - char mask_tex_uvlayer_name[32]; /* Name of the UV layer. */ + char mask_tex_uvlayer_name[32]; /* Name of the UV Map. */ float min_dist, max_dist; /* Distances mapping to 0.0/1.0 weights. */ Index: source/blender/collada/GeometryExporter.cpp =================================================================== --- source/blender/collada/GeometryExporter.cpp (revision 42026) +++ source/blender/collada/GeometryExporter.cpp (working copy) @@ -196,7 +196,7 @@ COLLADASW::Input input3(COLLADASW::InputSemantic::TEXCOORD, makeUrl(makeTexcoordSourceId(geom_id, i)), 2, // offset always 2, this is only until we have optimized UV sets - i // set number equals UV layer index + i // set number equals UV map index ); til.push_back(input3); } Index: source/blender/collada/InstanceWriter.cpp =================================================================== --- source/blender/collada/InstanceWriter.cpp (revision 42026) +++ source/blender/collada/InstanceWriter.cpp (working copy) @@ -55,7 +55,7 @@ ostr << translate_id(id_name(ma)) << a+1; COLLADASW::InstanceMaterial im(ostr.str(), COLLADASW::URI(COLLADABU::Utils::EMPTY_STRING, matid)); - // create for each uv layer + // create for each uv map Mesh *me = (Mesh*)ob->data; int totlayer = CustomData_number_of_layers(&me->fdata, CD_MTFACE); Index: source/blender/collada/MeshImporter.cpp =================================================================== --- source/blender/collada/MeshImporter.cpp (revision 42026) +++ source/blender/collada/MeshImporter.cpp (working copy) @@ -417,7 +417,7 @@ me->totface = mesh->getFacesCount() + new_tris; me->mface = (MFace*)CustomData_add_layer(&me->fdata, CD_MFACE, CD_CALLOC, NULL, me->totface); - // allocate UV layers + // allocate UV Maps unsigned int totuvset = mesh->getUVCoords().getInputInfosArray().getCount(); for (i = 0; i < totuvset; i++) { @@ -433,7 +433,7 @@ //this->set_layername_map[i] = CustomData_get_layer_name(&me->fdata, CD_MTFACE, i); } - // activate the first uv layer + // activate the first uv map if (totuvset) me->mtface = (MTFace*)CustomData_get_layer_n(&me->fdata, CD_MTFACE, 0); UVDataWrapper uvs(mesh->getUVCoords()); Index: source/blender/makesrna/intern/rna_modifier.c =================================================================== --- source/blender/makesrna/intern/rna_modifier.c (revision 42026) +++ source/blender/makesrna/intern/rna_modifier.c (working copy) @@ -805,7 +805,7 @@ prop= RNA_def_property(srna, "uv_layer", PROP_STRING, PROP_NONE); RNA_def_property_string_sdna(prop, NULL, "uvlayer_name"); - RNA_def_property_ui_text(prop, "UV Layer", "UV layer name"); + RNA_def_property_ui_text(prop, "UV Map", "UV Map name"); RNA_def_property_string_funcs(prop, NULL, NULL, "rna_MappingInfo_uvlayer_set"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); @@ -1233,7 +1233,7 @@ prop= RNA_def_property(srna, "uv_layer", PROP_STRING, PROP_NONE); RNA_def_property_string_sdna(prop, NULL, "uvlayer_name"); - RNA_def_property_ui_text(prop, "UV Layer", "UV layer name"); + RNA_def_property_ui_text(prop, "UV Map", "UV Map name"); RNA_def_property_string_funcs(prop, NULL, NULL, "rna_WaveModifier_uvlayer_set"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); @@ -1604,7 +1604,7 @@ prop= RNA_def_property(srna, "uv_layer", PROP_STRING, PROP_NONE); RNA_def_property_string_sdna(prop, NULL, "uvlayer_name"); - RNA_def_property_ui_text(prop, "UV Layer", "UV layer name"); + RNA_def_property_ui_text(prop, "UV Map", "UV Map name"); RNA_def_property_string_funcs(prop, NULL, NULL, "rna_UVProjectModifier_uvlayer_set"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); @@ -2001,7 +2001,7 @@ prop= RNA_def_property(srna, "particle_uv", PROP_STRING, PROP_NONE); RNA_def_property_string_sdna(prop, NULL, "uvname"); RNA_def_property_string_maxlength(prop, 32); - RNA_def_property_ui_text(prop, "Particle UV", "UV Layer to change with particle age"); + RNA_def_property_ui_text(prop, "Particle UV", "UV Map to change with particle age"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); } @@ -2620,7 +2620,7 @@ prop= RNA_def_property(srna, "mask_tex_uv_layer", PROP_STRING, PROP_NONE); RNA_def_property_string_sdna(prop, NULL, "mask_tex_uvlayer_name"); - RNA_def_property_ui_text(prop, "UV Layer", "UV layer name"); + RNA_def_property_ui_text(prop, "UV Map", "UV Map name"); RNA_def_property_string_funcs(prop, NULL, NULL, "rna_WeightVGModifier_mask_uvlayer_set"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); Index: source/blender/makesrna/intern/rna_sculpt_paint.c =================================================================== --- source/blender/makesrna/intern/rna_sculpt_paint.c (revision 42026) +++ source/blender/makesrna/intern/rna_sculpt_paint.c (working copy) @@ -339,7 +339,7 @@ prop= RNA_def_property(srna, "use_stencil_layer", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", IMAGEPAINT_PROJECT_LAYER_STENCIL); - RNA_def_property_ui_text(prop, "Stencil Layer", "Set the mask layer from the UV layer buttons"); + RNA_def_property_ui_text(prop, "Stencil Layer", "Set the mask layer from the UV Map buttons"); prop= RNA_def_property(srna, "invert_stencil", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", IMAGEPAINT_PROJECT_LAYER_STENCIL_INV); @@ -347,8 +347,8 @@ prop= RNA_def_property(srna, "use_clone_layer", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", IMAGEPAINT_PROJECT_LAYER_CLONE); - RNA_def_property_ui_text(prop, "Clone Layer", - "Use another UV layer as clone source, otherwise use 3D the cursor as the source"); + RNA_def_property_ui_text(prop, "Clone Map", + "Use another UV Map as clone source, otherwise use 3D the cursor as the source"); /* integers */ Index: source/blender/makesrna/intern/rna_particle.c =================================================================== --- source/blender/makesrna/intern/rna_particle.c (revision 42026) +++ source/blender/makesrna/intern/rna_particle.c (working copy) @@ -1287,7 +1287,7 @@ prop= RNA_def_property(srna, "uv_layer", PROP_STRING, PROP_NONE); RNA_def_property_string_sdna(prop, NULL, "uvname"); - RNA_def_property_ui_text(prop, "UV Layer", "UV layer to use for mapping with UV texture coordinates"); + RNA_def_property_ui_text(prop, "UV Map", "UV Map to use for mapping with UV texture coordinates"); RNA_def_property_update(prop, 0, "rna_Particle_reset"); prop= RNA_def_property(srna, "mapping_x", PROP_ENUM, PROP_NONE); @@ -2717,17 +2717,17 @@ prop= RNA_def_property(srna, "billboard_normal_uv", PROP_STRING, PROP_NONE); RNA_def_property_string_sdna(prop, NULL, "bb_uvname[0]"); RNA_def_property_string_maxlength(prop, 32); - RNA_def_property_ui_text(prop, "Billboard Normal UV", "UV Layer to control billboard normals"); + RNA_def_property_ui_text(prop, "Billboard Normal UV", "UV Map to control billboard normals"); prop= RNA_def_property(srna, "billboard_time_index_uv", PROP_STRING, PROP_NONE); RNA_def_property_string_sdna(prop, NULL, "bb_uvname[1]"); RNA_def_property_string_maxlength(prop, 32); - RNA_def_property_ui_text(prop, "Billboard Time Index UV", "UV Layer to control billboard time index (X-Y)"); + RNA_def_property_ui_text(prop, "Billboard Time Index UV", "UV Map to control billboard time index (X-Y)"); prop= RNA_def_property(srna, "billboard_split_uv", PROP_STRING, PROP_NONE); RNA_def_property_string_sdna(prop, NULL, "bb_uvname[2]"); RNA_def_property_string_maxlength(prop, 32); - RNA_def_property_ui_text(prop, "Billboard Split UV", "UV Layer to control billboard splitting"); + RNA_def_property_ui_text(prop, "Billboard Split UV", "UV Map to control billboard splitting"); /* vertex groups */ Index: source/blender/makesrna/intern/rna_nodetree.c =================================================================== --- source/blender/makesrna/intern/rna_nodetree.c (revision 42026) +++ source/blender/makesrna/intern/rna_nodetree.c (working copy) @@ -1151,7 +1151,7 @@ prop = RNA_def_property(srna, "uv_layer", PROP_STRING, PROP_NONE); RNA_def_property_string_sdna(prop, NULL, "uvname"); - RNA_def_property_ui_text(prop, "UV Layer", ""); + RNA_def_property_ui_text(prop, "UV Map", ""); RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update"); prop = RNA_def_property(srna, "color_layer", PROP_STRING, PROP_NONE); Index: source/blender/makesrna/intern/rna_dynamicpaint.c =================================================================== --- source/blender/makesrna/intern/rna_dynamicpaint.c (revision 42026) +++ source/blender/makesrna/intern/rna_dynamicpaint.c (working copy) @@ -412,7 +412,7 @@ prop= RNA_def_property(srna, "uv_layer", PROP_STRING, PROP_NONE); RNA_def_property_string_sdna(prop, NULL, "uvlayer_name"); - RNA_def_property_ui_text(prop, "UV Layer", "UV layer name"); + RNA_def_property_ui_text(prop, "UV Map", "UV Map name"); RNA_def_property_string_funcs(prop, NULL, NULL, "rna_DynamicPaint_uvlayer_set"); prop= RNA_def_property(srna, "frame_start", PROP_INT, PROP_NONE); Index: source/blender/makesrna/intern/rna_material.c =================================================================== --- source/blender/makesrna/intern/rna_material.c (revision 42026) +++ source/blender/makesrna/intern/rna_material.c (working copy) @@ -443,7 +443,7 @@ prop= RNA_def_property(srna, "uv_layer", PROP_STRING, PROP_NONE); RNA_def_property_string_sdna(prop, NULL, "uvname"); - RNA_def_property_ui_text(prop, "UV Layer", "UV layer to use for mapping with UV texture coordinates"); + RNA_def_property_ui_text(prop, "UV Map", "UV Map to use for mapping with UV texture coordinates"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "use_from_dupli", PROP_BOOLEAN, PROP_NONE); @@ -1604,7 +1604,7 @@ prop= RNA_def_property(srna, "uv_layer", PROP_STRING, PROP_NONE); RNA_def_property_string_sdna(prop, NULL, "strand_uvname"); - RNA_def_property_ui_text(prop, "UV Layer", "Name of UV layer to override"); + RNA_def_property_ui_text(prop, "UV Map", "Name of UV Map to override"); RNA_def_property_update(prop, 0, "rna_Material_update"); } Index: source/blender/makesrna/intern/rna_mesh.c =================================================================== --- source/blender/makesrna/intern/rna_mesh.c (revision 42026) +++ 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 Map"); 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 Map 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 Map", "Active UV Map"); 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 Map Index", "Active UV Map 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 42026) +++ source/blender/blenloader/intern/readfile.c (working copy) @@ -6479,8 +6479,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/editmesh_tools.c =================================================================== --- source/blender/editors/mesh/editmesh_tools.c (revision 42026) +++ source/blender/editors/mesh/editmesh_tools.c (working copy) @@ -4389,7 +4389,7 @@ } look = look->next; } - } /* end uv layer loop */ + } /* end uv map loop */ } /* end uvlay_tot */ Index: source/blender/editors/mesh/mesh_data.c =================================================================== --- source/blender/editors/mesh/mesh_data.c (revision 42026) +++ 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 Map"; + ot->description= "Add UV Map"; ot->idname= "MESH_OT_uv_texture_add"; /* api callbacks */ @@ -417,8 +417,8 @@ void MESH_OT_drop_named_image(wmOperatorType *ot) { /* identifiers */ - ot->name= "Assign Image to UV Texture"; - ot->description= "Assigns Image to active UV layer, or creates a UV layer"; + ot->name= "Assign Image to UV Map"; + ot->description= "Assigns Image to active UV Map, or creates a UV Map"; ot->idname= "MESH_OT_drop_named_image"; /* api callbacks */ @@ -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 Map"; + ot->description= "Remove UV Map"; ot->idname= "MESH_OT_uv_texture_remove"; /* api callbacks */ Index: source/blender/editors/uvedit/uvedit_unwrap_ops.c =================================================================== --- source/blender/editors/uvedit/uvedit_unwrap_ops.c (revision 42026) +++ source/blender/editors/uvedit/uvedit_unwrap_ops.c (working copy) @@ -896,7 +896,7 @@ /* ******************** Unwrap operator **************** */ -/* assumes UV layer is checked, doesn't run update funcs */ +/* assumes UV Map is checked, doesn't run update funcs */ void ED_unwrap_lscm(Scene *scene, Object *obedit, const short sel) { EditMesh *em= BKE_mesh_get_editmesh((Mesh*)obedit->data); Index: source/blender/editors/uvedit/uvedit_ops.c =================================================================== --- source/blender/editors/uvedit/uvedit_ops.c (revision 42026) +++ source/blender/editors/uvedit/uvedit_ops.c (working copy) @@ -165,7 +165,7 @@ else { /* old shading system, assign image to selected faces */ - /* ensure we have a uv layer */ + /* ensure we have a uv map */ if(!CustomData_has_layer(&em->fdata, CD_MTFACE)) { EM_add_data_layer(em, &em->fdata, CD_MTFACE, NULL); update= 1; Index: source/blender/editors/sculpt_paint/paint_image.c =================================================================== --- source/blender/editors/sculpt_paint/paint_image.c (revision 42026) +++ source/blender/editors/sculpt_paint/paint_image.c (working copy) @@ -263,7 +263,7 @@ MVert *dm_mvert; MFace *dm_mface; MTFace *dm_mtface; - MTFace *dm_mtface_clone; /* other UV layer, use for cloning between layers */ + MTFace *dm_mtface_clone; /* other UV map, use for cloning between layers */ MTFace *dm_mtface_stencil; /* projection painting only */ @@ -1347,7 +1347,7 @@ /* Image Mask */ if (ps->do_layer_stencil) { - /* another UV layers image is masking this one's */ + /* another UV maps image is masking this one's */ ImBuf *ibuf_other; Image *other_tpage = project_paint_face_image(ps, face_index); const MTFace *tf_other = ps->dm_mtface_stencil + face_index; Index: source/blender/editors/transform/transform.c =================================================================== --- source/blender/editors/transform/transform.c (revision 42026) +++ source/blender/editors/transform/transform.c (working copy) @@ -4740,7 +4740,7 @@ } look = look->next; } - } /* end uv layer loop */ + } /* end uv map loop */ } /* end uvlay_tot */ sld->uvhash = uvarray; Index: doc/python_api/rst/gpu.rst =================================================================== --- doc/python_api/rst/gpu.rst (revision 42026) +++ doc/python_api/rst/gpu.rst (working copy) @@ -278,7 +278,7 @@ .. data:: CD_MTFACE - Vertex attribute is a UV layer. Data type is vector of 2 float. + Vertex attribute is a UV Map. Data type is vector of 2 float. There can be more than one attribute of that type, they are differenciated by name. In blender, you can retrieve the attribute data with: @@ -495,10 +495,10 @@ for uniform in shader['uniforms']: if uniform['type'] == gpu.GPU_DYNAMIC_SAMPLER_2DIMAGE: print("uniform {0} is using image {1}".format(uniform['varname'], uniform['image'].filepath)) - # scan the attribute list and find the UV layer used in the shader + # scan the attribute list and find the UV Map used in the shader for attribute in shader['attributes']: if attribute['type'] == gpu.CD_MTFACE: - print("attribute {0} is using UV layer {1}".format(attribute['varname'], attribute['name'])) + print("attribute {0} is using UV Map {1}".format(attribute['varname'], attribute['name'])) ***** Notes