Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-02-24 16:10:41 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-02-24 16:10:41 +0400
commit73e73ed1e070616b1fd838499b654b56d02fe084 (patch)
treee5b6ed7c3b00e42d6ce1c861025db408fa5ef5f3
parentc839ff3acbf92645b5fac3ea884344d2117df4bb (diff)
change default name of Texture face layer to UVMap, while we fake UV's and texface as being the same.
-rw-r--r--source/blender/blenkernel/intern/customdata.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c
index 01216cef7ef..7ed9a7603ac 100644
--- a/source/blender/blenkernel/intern/customdata.c
+++ b/source/blender/blenkernel/intern/customdata.c
@@ -979,7 +979,8 @@ static const LayerTypeInfo LAYERTYPEINFO[CD_NUMTYPES] = {
/* 14: CD_ORCO */
{sizeof(float)*3, "", 0, NULL, NULL, NULL, NULL, NULL, NULL},
/* 15: CD_MTEXPOLY */
- {sizeof(MTexPoly), "MTexPoly", 1, "Face Texture", NULL, NULL, NULL, NULL, NULL},
+ /* note, when we expose the UV Map / TexFace split to the user, change this back to face Texture */
+ {sizeof(MTexPoly), "MTexPoly", 1, "UVMap"/* "Face Texture" */, NULL, NULL, NULL, NULL, NULL},
/* 16: CD_MLOOPUV */
{sizeof(MLoopUV), "MLoopUV", 1, "UV coord", NULL, NULL, layerInterp_mloopuv, NULL, NULL,
layerEqual_mloopuv, layerMultiply_mloopuv, layerInitMinMax_mloopuv,