summaryrefslogtreecommitdiffstats
path: root/scene/resources/surface_tool.cpp
diff options
context:
space:
mode:
authorAnton Yabchinskiy <arn@bestmx.ru>2015-01-05 23:56:24 +0300
committerAnton Yabchinskiy <arn@bestmx.ru>2015-01-05 23:56:24 +0300
commita7875c586af74302584544d777b189f4cb85c393 (patch)
treef4929f77383d835b5be8b6e099b9db59000af610 /scene/resources/surface_tool.cpp
parent4ab1bcde35a02cfe7b25d630720de1cc81ef5a1a (diff)
parent8c4dd8de3919b789eac1a0f030563008bdcd44f5 (diff)
downloadredot-engine-a7875c586af74302584544d777b189f4cb85c393.tar.gz
Merge branch 'master' of github.com:okamstudio/godot
Diffstat (limited to 'scene/resources/surface_tool.cpp')
-rw-r--r--scene/resources/surface_tool.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/scene/resources/surface_tool.cpp b/scene/resources/surface_tool.cpp
index dd39205932..113fd8209d 100644
--- a/scene/resources/surface_tool.cpp
+++ b/scene/resources/surface_tool.cpp
@@ -650,8 +650,8 @@ void SurfaceTool::mikktGetTexCoord(const SMikkTSpaceContext * pContext, float fv
Vector<List<Vertex>::Element*> &varr = *((Vector<List<Vertex>::Element*>*)pContext->m_pUserData);
Vector2 v = varr[iFace*3+iVert]->get().uv;
fvTexcOut[0]=v.x;
- //fvTexcOut[1]=v.y;
- fvTexcOut[1]=1.0-v.y;
+ fvTexcOut[1]=v.y;
+ //fvTexcOut[1]=1.0-v.y;
}
void SurfaceTool::mikktSetTSpaceBasic(const SMikkTSpaceContext * pContext, const float fvTangent[], const float fSign, const int iFace, const int iVert){