From 2345efc6c5612da7f2a627ceb6bf0b7a828a676b Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Wed, 23 Nov 2011 17:25:25 +0000 Subject: 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. --- source/blender/collada/GeometryExporter.cpp | 2 +- source/blender/collada/InstanceWriter.cpp | 2 +- source/blender/collada/MeshImporter.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'source/blender/collada') diff --git a/source/blender/collada/GeometryExporter.cpp b/source/blender/collada/GeometryExporter.cpp index 22a3b713161..8bc9755faae 100644 --- a/source/blender/collada/GeometryExporter.cpp +++ b/source/blender/collada/GeometryExporter.cpp @@ -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); } diff --git a/source/blender/collada/InstanceWriter.cpp b/source/blender/collada/InstanceWriter.cpp index ceb4b295f2f..40ca1bc3b0e 100644 --- a/source/blender/collada/InstanceWriter.cpp +++ b/source/blender/collada/InstanceWriter.cpp @@ -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 for each uv layer + // create for each uv map Mesh *me = (Mesh*)ob->data; int totlayer = CustomData_number_of_layers(&me->fdata, CD_MTFACE); diff --git a/source/blender/collada/MeshImporter.cpp b/source/blender/collada/MeshImporter.cpp index 4e7c35315fc..e57d2acd41d 100644 --- a/source/blender/collada/MeshImporter.cpp +++ b/source/blender/collada/MeshImporter.cpp @@ -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()); -- cgit v1.2.3