Patch #29336: renaming UV (Texture) Layer to UV Map in the user interface,
authorBrecht Van Lommel <brechtvanlommel@pandora.be>
Wed, 23 Nov 2011 17:25:25 +0000 (17:25 +0000)
committerBrecht Van Lommel <brechtvanlommel@pandora.be>
Wed, 23 Nov 2011 17:25:25 +0000 (17:25 +0000)
by Gaia Clary.

Rationale: the name was confusing and not always used consistently, and this
map itself is not something that can be layered, rather the map can be used
as texture coordinates in some layered setup.

The original intent was to indicate this contained more than just UV's, but
the game engine settings have already been moved out, and apparently users
didn't really get this from the name anyway.

30 files changed:
doc/python_api/rst/gpu.rst
intern/cycles/blender/blender_mesh.cpp
release/scripts/startup/bl_operators/uvcalc_lightmap.py
release/scripts/startup/bl_ui/properties_data_mesh.py
release/scripts/startup/bl_ui/properties_data_modifier.py
release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
release/scripts/startup/bl_ui/properties_texture.py
source/blender/blenkernel/intern/customdata.c
source/blender/blenkernel/intern/dynamicpaint.c
source/blender/blenloader/intern/readfile.c
source/blender/collada/GeometryExporter.cpp
source/blender/collada/InstanceWriter.cpp
source/blender/collada/MeshImporter.cpp
source/blender/editors/mesh/editmesh_tools.c
source/blender/editors/mesh/mesh_data.c
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/transform/transform.c
source/blender/editors/uvedit/uvedit_ops.c
source/blender/editors/uvedit/uvedit_unwrap_ops.c
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesrna/intern/rna_dynamicpaint.c
source/blender/makesrna/intern/rna_material.c
source/blender/makesrna/intern/rna_mesh.c
source/blender/makesrna/intern/rna_modifier.c
source/blender/makesrna/intern/rna_nodetree.c
source/blender/makesrna/intern/rna_particle.c
source/blender/makesrna/intern/rna_sculpt_paint.c
source/blender/modifiers/intern/MOD_uvproject.c
source/blender/nodes/shader/nodes/node_shader_geom.c
source/blender/render/intern/source/render_texture.c

index 2ca7fdda9d5225809402ea9fa9ba03878996c4ba..2400e0476b3b85aad2f1b9939d864076f7da0cd3 100644 (file)
@@ -278,7 +278,7 @@ layer that contains the vertex attribute.
 
 .. 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 @@ Functions
         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
index 56e8561d64b56b00d396683908df69d7ec81d1b3..2bc79224e087dbf9f7899f2d85bf989ca243172b 100644 (file)
@@ -144,7 +144,7 @@ static void create_mesh(Scene *scene, Mesh *mesh, BL::Mesh b_mesh, const vector<
                }
        }
 
-       /* create uv layer attributes */
+       /* create uv map attributes */
        {
                BL::Mesh::uv_textures_iterator l;
 
index ae4add72a084454175208470abf48433324fbbd3..99a492fab4af6598b9a56d6d52e885d3c670ae19 100644 (file)
@@ -566,8 +566,8 @@ class LightMapPack(Operator):
             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 425b7a601c8190bf02876e8d22612d6ebb48b299..4e52aeb03d2f5cd1832fcb9a346bea9b8cc31f12 100644 (file)
@@ -265,7 +265,7 @@ class DATA_PT_shape_keys(MeshButtonsPanel, Panel):
 
 
 class DATA_PT_uv_texture(MeshButtonsPanel, Panel):
-    bl_label = "UV Texture"
+    bl_label = "UV Maps"
     COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
 
     def draw(self, context):
index 288f04b084e5340e2d93b7a279a36c0f33dc9987..d5b8b9d110d8159b918ff224966f902c3a495719 100644 (file)
@@ -692,7 +692,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
         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 68fa0cedaa319d5b116f2679929a5a644abc4d47..3797d7f363c6590935966a2b1220015f2406b03e 100644 (file)
@@ -242,7 +242,7 @@ class PHYSICS_PT_dp_canvas_output(PhysicButtonsPanel, Panel):
         # 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 @@ class PHYSICS_PT_dp_canvas_initial_color(PhysicButtonsPanel, Panel):
 
         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 6b4cfa8fb9587b38d18fd2e877f457dac5e89d3b..9f67edd76532f58c2f221d3f069e8fc256e229be 100644 (file)
@@ -831,7 +831,7 @@ class TEXTURE_PT_mapping(TextureSlotPanel, Panel):
                 """
             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 9cbed451c09ff5e730b637a2b3a2ed2e199e50a5..6efd0a2727f71b81215eaa734b721e9fbbeee8db 100644 (file)
@@ -818,7 +818,7 @@ static const LayerTypeInfo LAYERTYPEINFO[CD_NUMTYPES] = {
        /* 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 @@ static const LayerTypeInfo LAYERTYPEINFO[CD_NUMTYPES] = {
        /* 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 4f3e37391f45fc8566c39a9f838a09d05a5f98ba..b5b345c04a13444cc07dbb3b69ccaba634b1b1bf 100644 (file)
@@ -1307,7 +1307,7 @@ void dynamicPaint_setInitialColor(DynamicPaintSurface *surface)
 
                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 @@ int dynamicPaint_createUVSurface(DynamicPaintSurface *surface)
        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 a6aecac1c34db8b460d263f2c0957a6d9cdea7f1..61f0989a6f2a6bc7e666423e2579f499c0b99504 100644 (file)
@@ -6479,8 +6479,8 @@ static void customdata_version_242(Mesh *me)
 
                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, "UVMap");
+                               else sprintf(layer->name, "UVMap.%.3d", mtfacen);
                        }
                        mtfacen++;
                }
index 22a3b71316195802055b1ffb21121cd441b68e98..8bc9755faae9172dba8f86809f1714dfc694458b 100644 (file)
@@ -196,7 +196,7 @@ void GeometryExporter::createPolylist(short material_index,
                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 ceb4b295f2f3288f3e96b156276f6baa78841908..40ca1bc3b0eb1dbb01abfece11e9f63e9015f536 100644 (file)
@@ -55,7 +55,7 @@ void InstanceWriter::add_material_bindings(COLLADASW::BindMaterial& bind_materia
                        ostr << translate_id(id_name(ma)) << a+1;
                        COLLADASW::InstanceMaterial im(ostr.str(), COLLADASW::URI(COLLADABU::Utils::EMPTY_STRING, matid));
                        
-                       // create <bind_vertex_input> for each uv layer
+                       // create <bind_vertex_input> for each uv map
                        Mesh *me = (Mesh*)ob->data;
                        int totlayer = CustomData_number_of_layers(&me->fdata, CD_MTFACE);
                        
index 4e7c35315fc01d06fdef573dda7a9801968815a4..e57d2acd41dd2e8532289adebb67207e2a18be0a 100644 (file)
@@ -417,7 +417,7 @@ void MeshImporter::read_faces(COLLADAFW::Mesh *mesh, Mesh *me, int new_tris) //T
        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 @@ void MeshImporter::read_faces(COLLADAFW::Mesh *mesh, Mesh *me, int new_tris) //T
                //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 4ac418fdd9ac835d6397d228ec0b661d1f34a705..8ae13531a877544ff260723522351a268892a7a9 100644 (file)
@@ -4389,7 +4389,7 @@ useless:
                                }
                                look = look->next;
                        }
-               } /* end uv layer loop */
+               } /* end uv map loop */
        } /* end uvlay_tot */
 
 
index 46076d0bec4c1c19587c4d8c789fb8ede199d651..aa94b48c1e929ba84ec50b09e9f2f0d56454608f 100644 (file)
@@ -337,8 +337,8 @@ static int uv_texture_add_exec(bContext *C, wmOperator *UNUSED(op))
 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 @@ static int drop_named_image_invoke(bContext *C, wmOperator *op, wmEvent *event)
 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 @@ static int uv_texture_remove_exec(bContext *C, wmOperator *UNUSED(op))
 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 e1a45a6367cf93db59ed6a9f789ace1ae6ebefce..d557a3bd14474a5166b5fbd91cf6505cecceb052 100644 (file)
@@ -263,7 +263,7 @@ typedef struct ProjPaintState {
        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 @@ static float project_paint_uvpixel_mask(
        
        /* 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, ps->dm_mtface_stencil, face_index);
                const MTFace *tf_other = ps->dm_mtface_stencil + face_index;
index 73a71a25ebab5a4e2b8e40fedbab7ef199cb5625..cee7b19470b02504a49520d7dddda63bbc3c448a 100644 (file)
@@ -4740,7 +4740,7 @@ static int createSlideVerts(TransInfo *t)
                                }
                                look = look->next;
                        }
-               } /* end uv layer loop */
+               } /* end uv map loop */
        } /* end uvlay_tot */
 
        sld->uvhash = uvarray;
index 7fc878de3f98e1eb3a5494cbbc56fd061bd793de..92bd74db68ac336b7195528d17b96e5a3a01d4c0 100644 (file)
@@ -165,7 +165,7 @@ void ED_uvedit_assign_image(Main *bmain, Scene *scene, Object *obedit, Image *im
        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 11cd50a7d4e6d234f12f279b62ea154e5f720a03..c565e2fc3050c0491e881fc59de3a8c3ec43505c 100644 (file)
@@ -896,7 +896,7 @@ static void uv_map_clip_correct(EditMesh *em, wmOperator *op)
 
 /* ******************** 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 ed3d42a9da702a0c748013e2b56e2edbcf452b96..4abbbd7146d8f8b54c46c1790e66171c870a4fd7 100644 (file)
@@ -878,7 +878,7 @@ typedef struct WeightVGEditModifierData {
        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 @@ typedef struct WeightVGMixModifierData {
        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 @@ typedef struct WeightVGProximityModifierData {
        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 d0d470812982b9bb50ab7f9a2b9d939211d8e9eb..d06ab63ca8ab67a0df55a7a3975b7e998e8c91ea 100644 (file)
@@ -412,7 +412,7 @@ static void rna_def_canvas_surface(BlenderRNA *brna)
        
        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 57770be57ebea029e31f477df73d58db4dc5c35b..ce8f903bfe2fdcd57219dd1fe77332a790df9aa1 100644 (file)
@@ -443,7 +443,7 @@ static void rna_def_material_mtex(BlenderRNA *brna)
 
        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 @@ static void rna_def_material_strand(BlenderRNA *brna)
 
        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");
 }
 
@@ -1841,13 +1841,13 @@ void RNA_def_material(BlenderRNA *brna)
        prop= RNA_def_property(srna, "use_face_texture", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "mode", MA_FACETEXTURE);
        RNA_def_property_ui_text(prop, "Face Textures",
-                                "Replace the object's base color with color from face assigned image textures");
+                                "Replace the object's base color with color from UV map image textures");
        RNA_def_property_update(prop, 0, "rna_Material_update");
        
        prop= RNA_def_property(srna, "use_face_texture_alpha", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "mode", MA_FACETEXTURE_ALPHA);
        RNA_def_property_ui_text(prop, "Face Textures Alpha",
-                                "Replace the object's base alpha value with alpha from face assigned image textures");
+                                "Replace the object's base alpha value with alpha from UV map image textures");
        RNA_def_property_update(prop, 0, "rna_Material_update");
        
        prop= RNA_def_property(srna, "use_cast_shadows_only", PROP_BOOLEAN, PROP_NONE);
index 421c201b3f86182b51d3556c4ae7fba2d7503c2d..02be3183f2c8d8a484742bd4a37c28f922da74bc 100644 (file)
@@ -1407,7 +1407,7 @@ static void rna_def_mtface(BlenderRNA *brna)
        const int uv_dim[]= {4, 2};
 
        srna= RNA_def_struct(brna, "MeshTextureFaceLayer", NULL);
-       RNA_def_struct_ui_text(srna, "Mesh Texture Face Layer", "Layer of texture faces in a Mesh datablock");
+       RNA_def_struct_ui_text(srna, "Mesh UV Map", "UV map with assigned image textures in a Mesh datablock");
        RNA_def_struct_sdna(srna, "CustomDataLayer");
        RNA_def_struct_path_func(srna, "rna_MeshTextureFaceLayer_path");
        RNA_def_struct_ui_icon(srna, ICON_GROUP_UVS);
@@ -1415,25 +1415,25 @@ static void rna_def_mtface(BlenderRNA *brna)
        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);
        RNA_def_property_boolean_funcs(prop, "rna_MeshTextureFaceLayer_active_get", "rna_MeshTextureFaceLayer_active_set");
-       RNA_def_property_ui_text(prop, "Active", "Set the layer as active for display and editing");
+       RNA_def_property_ui_text(prop, "Active", "Set the map as active for display and editing");
        RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
 
        prop= RNA_def_property(srna, "active_render", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "active_rnd", 0);
        RNA_def_property_boolean_funcs(prop, "rna_MeshTextureFaceLayer_active_render_get",
                                       "rna_MeshTextureFaceLayer_active_render_set");
-       RNA_def_property_ui_text(prop, "Active Render", "Set the layer as active for rendering");
+       RNA_def_property_ui_text(prop, "Active Render", "Set the map as active for rendering");
        RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
 
        prop= RNA_def_property(srna, "active_clone", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "active_clone", 0);
        RNA_def_property_boolean_funcs(prop, "rna_MeshTextureFaceLayer_clone_get", "rna_MeshTextureFaceLayer_clone_set");
-       RNA_def_property_ui_text(prop, "Active Clone", "Set the layer as active for cloning");
+       RNA_def_property_ui_text(prop, "Active Clone", "Set the map as active for cloning");
        RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
 
        prop= RNA_def_property(srna, "data", PROP_COLLECTION, PROP_NONE);
@@ -1445,7 +1445,7 @@ static void rna_def_mtface(BlenderRNA *brna)
 
        srna= RNA_def_struct(brna, "MeshTextureFace", NULL);
        RNA_def_struct_sdna(srna, "MTFace");
-       RNA_def_struct_ui_text(srna, "Mesh Texture Face", "UV mapping, texturing and game engine data for a face");
+       RNA_def_struct_ui_text(srna, "Mesh UV Map Face", "UV map and image texture for a face");
        RNA_def_struct_path_func(srna, "rna_MeshTextureFace_path");
        RNA_def_struct_ui_icon(srna, ICON_FACESEL_HLT);
 
@@ -1741,7 +1741,7 @@ static void rna_def_mesh_faces(BlenderRNA *brna, PropertyRNA *cprop)
        prop= RNA_def_property(srna, "active_tface", PROP_POINTER, PROP_UNSIGNED);
        RNA_def_property_struct_type(prop, "MeshTextureFace");
        RNA_def_property_pointer_funcs(prop, "rna_Mesh_active_mtface_get", NULL, NULL, NULL);
-       RNA_def_property_ui_text(prop, "Active Texture Face", "Active Texture Face");
+       RNA_def_property_ui_text(prop, "Active UV Map Face", "Active UV Map Face");
        RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
 
        func= RNA_def_function(srna, "add", "ED_mesh_faces_add");
@@ -1865,12 +1865,12 @@ static void rna_def_uv_textures(BlenderRNA *brna, PropertyRNA *cprop)
        RNA_def_property_srna(cprop, "UVTextures");
        srna= RNA_def_struct(brna, "UVTextures", NULL);
        RNA_def_struct_sdna(srna, "Mesh");
-       RNA_def_struct_ui_text(srna, "UV Textures", "Collection of uv textures");
+       RNA_def_struct_ui_text(srna, "UV Maps", "Collection of UV maps");
        
        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", "UVMap", 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 @@ static void rna_def_uv_textures(BlenderRNA *brna, PropertyRNA *cprop)
        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");
 }
 
@@ -1939,29 +1939,29 @@ static void rna_def_mesh(BlenderRNA *brna)
        RNA_def_property_collection_funcs(prop, "rna_Mesh_uv_textures_begin", NULL, NULL, NULL,
                                          "rna_Mesh_uv_textures_length", NULL, NULL, NULL);
        RNA_def_property_struct_type(prop, "MeshTextureFaceLayer");
-       RNA_def_property_ui_text(prop, "UV Textures", "");
+       RNA_def_property_ui_text(prop, "UV Maps", "");
        rna_def_uv_textures(brna, prop);
 
        prop= RNA_def_property(srna, "uv_texture_clone", PROP_POINTER, PROP_UNSIGNED);
        RNA_def_property_struct_type(prop, "MeshTextureFaceLayer");
        RNA_def_property_pointer_funcs(prop, "rna_Mesh_uv_texture_clone_get", "rna_Mesh_uv_texture_clone_set", NULL, NULL);
        RNA_def_property_flag(prop, PROP_EDITABLE);
-       RNA_def_property_ui_text(prop, "Clone UV Texture", "UV texture to be used as cloning source");
+       RNA_def_property_ui_text(prop, "Clone UV Map", "UV map to be used as cloning source");
 
        prop= RNA_def_property(srna, "uv_texture_clone_index", PROP_INT, PROP_UNSIGNED);
        RNA_def_property_int_funcs(prop, "rna_Mesh_uv_texture_clone_index_get",
                                   "rna_Mesh_uv_texture_clone_index_set", "rna_Mesh_active_uv_texture_index_range");
-       RNA_def_property_ui_text(prop, "Clone UV Texture Index", "Clone UV texture index");
+       RNA_def_property_ui_text(prop, "Clone UV Map Index", "Clone UV texture index");
 
        prop= RNA_def_property(srna, "uv_texture_stencil", PROP_POINTER, PROP_UNSIGNED);
        RNA_def_property_struct_type(prop, "MeshTextureFaceLayer");
        RNA_def_property_pointer_funcs(prop, "rna_Mesh_uv_texture_stencil_get", "rna_Mesh_uv_texture_stencil_set", NULL, NULL);
        RNA_def_property_flag(prop, PROP_EDITABLE);
-       RNA_def_property_ui_text(prop, "Mask UV Texture", "UV texture to mask the painted area");
+       RNA_def_property_ui_text(prop, "Mask UV Map", "UV map to mask the painted area");
 
        prop= RNA_def_property(srna, "uv_texture_stencil_index", PROP_INT, PROP_UNSIGNED);
        RNA_def_property_int_funcs(prop, "rna_Mesh_uv_texture_stencil_index_get", "rna_Mesh_uv_texture_stencil_index_set", "rna_Mesh_active_uv_texture_index_range");
-       RNA_def_property_ui_text(prop, "Mask UV Texture Index", "Mask UV texture index");
+       RNA_def_property_ui_text(prop, "Mask UV Map Index", "Mask UV map index");
 
        /* Vertex colors */
 
index a015eec584c317194f243ed2575c06ce9ff4b8c6..477f3135b709f726b4792bea2bd6933761b7546e 100644 (file)
@@ -805,7 +805,7 @@ static void rna_def_modifier_generic_map_info(StructRNA *srna)
 
        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 @@ static void rna_def_modifier_wave(BlenderRNA *brna)
 
        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 @@ static void rna_def_modifier_uvproject(BlenderRNA *brna)
 
        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 @@ static void rna_def_modifier_explode(BlenderRNA *brna)
        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 @@ static void rna_def_modifier_weightvg_mask(BlenderRNA *brna, StructRNA *srna)
 
        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 062fbad421af8b0737041f23a015cc65526b044e..af7b3303df18cda28866987559872375127020ea 100644 (file)
@@ -1187,7 +1187,7 @@ static void def_sh_geometry(StructRNA *srna)
        
        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 2e62a08408f49b00461be1f5e87de50013c958e1..2b26a09a64616eadf3f33d9f9cc7f1318090171a 100644 (file)
@@ -1287,7 +1287,7 @@ static void rna_def_particle_settings_mtex(BlenderRNA *brna)
 
        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 @@ static void rna_def_particle_system(BlenderRNA *brna)
        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 7e113c85bf631527bac03fa13b65ad7472f15f68..d0a50ba6badfb125e903e09dceb9e18afa11ec9b 100644 (file)
@@ -339,7 +339,7 @@ static void rna_def_image_paint(BlenderRNA *brna)
        
        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 @@ static void rna_def_image_paint(BlenderRNA *brna)
        
        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 e3abc16f98fba7e7387eb4ec82976b7ef33cded5..584aa6dc2061347efc078e2ea9f00170724cd0e5 100644 (file)
@@ -170,7 +170,7 @@ static DerivedMesh *uvprojectModifier_do(UVProjectModifierData *umd,
 
        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 @@ static DerivedMesh *uvprojectModifier_do(UVProjectModifierData *umd,
                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 2b28eae4085e2a48b27dea94efdf0904b4ffe64c..cf6f400ee2a2ce5f20d562f883e9ce09dca0cc6d 100644 (file)
@@ -61,7 +61,7 @@ static void node_shader_exec_geom(void *data, bNode *node, bNodeStack **UNUSED(i
                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 323f04cbd04c1a681968512cdab61778d18e7fb1..277ef90b9abc79b230ae7909687e7de75a7602da 100644 (file)
@@ -3684,7 +3684,7 @@ void RE_sample_material_color(Material *mat, float color[3], float *alpha, const
                        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<layers; i++) {
                                if(layer_index >= 0) {
                                        float *uv1, *uv2, *uv3;
@@ -3708,7 +3708,7 @@ void RE_sample_material_color(Material *mat, float color[3], float *alpha, const
                                        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;
                }