[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42098] trunk/blender: Patch #29336: renaming UV (Texture) Layer to UV Map in the user interface,
Brecht Van Lommel
brechtvanlommel at pandora.be
Wed Nov 23 18:25:25 CET 2011
Revision: 42098
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42098
Author: blendix
Date: 2011-11-23 17:25:25 +0000 (Wed, 23 Nov 2011)
Log Message:
-----------
Patch #29336: renaming UV (Texture) Layer to UV Map in the user interface,
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.
Modified Paths:
--------------
trunk/blender/doc/python_api/rst/gpu.rst
trunk/blender/intern/cycles/blender/blender_mesh.cpp
trunk/blender/release/scripts/startup/bl_operators/uvcalc_lightmap.py
trunk/blender/release/scripts/startup/bl_ui/properties_data_mesh.py
trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
trunk/blender/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
trunk/blender/release/scripts/startup/bl_ui/properties_texture.py
trunk/blender/source/blender/blenkernel/intern/customdata.c
trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/collada/GeometryExporter.cpp
trunk/blender/source/blender/collada/InstanceWriter.cpp
trunk/blender/source/blender/collada/MeshImporter.cpp
trunk/blender/source/blender/editors/mesh/editmesh_tools.c
trunk/blender/source/blender/editors/mesh/mesh_data.c
trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
trunk/blender/source/blender/editors/transform/transform.c
trunk/blender/source/blender/editors/uvedit/uvedit_ops.c
trunk/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c
trunk/blender/source/blender/makesdna/DNA_modifier_types.h
trunk/blender/source/blender/makesrna/intern/rna_dynamicpaint.c
trunk/blender/source/blender/makesrna/intern/rna_material.c
trunk/blender/source/blender/makesrna/intern/rna_mesh.c
trunk/blender/source/blender/makesrna/intern/rna_modifier.c
trunk/blender/source/blender/makesrna/intern/rna_nodetree.c
trunk/blender/source/blender/makesrna/intern/rna_particle.c
trunk/blender/source/blender/makesrna/intern/rna_sculpt_paint.c
trunk/blender/source/blender/modifiers/intern/MOD_uvproject.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_geom.c
trunk/blender/source/blender/render/intern/source/render_texture.c
Modified: trunk/blender/doc/python_api/rst/gpu.rst
===================================================================
--- trunk/blender/doc/python_api/rst/gpu.rst 2011-11-23 17:14:29 UTC (rev 42097)
+++ trunk/blender/doc/python_api/rst/gpu.rst 2011-11-23 17:25:25 UTC (rev 42098)
@@ -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
Modified: trunk/blender/intern/cycles/blender/blender_mesh.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_mesh.cpp 2011-11-23 17:14:29 UTC (rev 42097)
+++ trunk/blender/intern/cycles/blender/blender_mesh.cpp 2011-11-23 17:25:25 UTC (rev 42098)
@@ -144,7 +144,7 @@
}
}
- /* create uv layer attributes */
+ /* create uv map attributes */
{
BL::Mesh::uv_textures_iterator l;
Modified: trunk/blender/release/scripts/startup/bl_operators/uvcalc_lightmap.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_operators/uvcalc_lightmap.py 2011-11-23 17:14:29 UTC (rev 42097)
+++ trunk/blender/release/scripts/startup/bl_operators/uvcalc_lightmap.py 2011-11-23 17:25:25 UTC (rev 42098)
@@ -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(
Modified: trunk/blender/release/scripts/startup/bl_ui/properties_data_mesh.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_data_mesh.py 2011-11-23 17:14:29 UTC (rev 42097)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_data_mesh.py 2011-11-23 17:25:25 UTC (rev 42098)
@@ -265,7 +265,7 @@
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):
Modified: trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py 2011-11-23 17:14:29 UTC (rev 42097)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py 2011-11-23 17:25:25 UTC (rev 42098)
@@ -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()
Modified: trunk/blender/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py 2011-11-23 17:14:29 UTC (rev 42097)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py 2011-11-23 17:25:25 UTC (rev 42098)
@@ -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: ")
Modified: trunk/blender/release/scripts/startup/bl_ui/properties_texture.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_texture.py 2011-11-23 17:14:29 UTC (rev 42097)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_texture.py 2011-11-23 17:25:25 UTC (rev 42098)
@@ -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="")
Modified: trunk/blender/source/blender/blenkernel/intern/customdata.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/customdata.c 2011-11-23 17:14:29 UTC (rev 42097)
+++ trunk/blender/source/blender/blenkernel/intern/customdata.c 2011-11-23 17:25:25 UTC (rev 42098)
@@ -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},
Modified: trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c 2011-11-23 17:14:29 UTC (rev 42097)
+++ trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c 2011-11-23 17:25:25 UTC (rev 42098)
@@ -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);
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2011-11-23 17:14:29 UTC (rev 42097)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2011-11-23 17:25:25 UTC (rev 42098)
@@ -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, "UVMap");
+ else sprintf(layer->name, "UVMap.%.3d", mtfacen);
}
mtfacen++;
}
Modified: trunk/blender/source/blender/collada/GeometryExporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/GeometryExporter.cpp 2011-11-23 17:14:29 UTC (rev 42097)
+++ trunk/blender/source/blender/collada/GeometryExporter.cpp 2011-11-23 17:25:25 UTC (rev 42098)
@@ -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);
}
Modified: trunk/blender/source/blender/collada/InstanceWriter.cpp
===================================================================
--- trunk/blender/source/blender/collada/InstanceWriter.cpp 2011-11-23 17:14:29 UTC (rev 42097)
+++ trunk/blender/source/blender/collada/InstanceWriter.cpp 2011-11-23 17:25:25 UTC (rev 42098)
@@ -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 <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);
Modified: trunk/blender/source/blender/collada/MeshImporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/MeshImporter.cpp 2011-11-23 17:14:29 UTC (rev 42097)
+++ trunk/blender/source/blender/collada/MeshImporter.cpp 2011-11-23 17:25:25 UTC (rev 42098)
@@ -417,7 +417,7 @@
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list