From 73d109c7cca9d94210248ef464605c45cc3e57f4 Mon Sep 17 00:00:00 2001 From: aramis_acg Date: Fri, 29 Apr 2011 21:32:13 +0000 Subject: [PATCH] # bugfix [3295074]: copy'n'paste bug in ReadSamplerProperties would cause y-axis sampler state to be assigned to the respective x values. git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@975 67173fc5-114c-0410-ac8e-9d2fd5bffc1f --- code/ColladaParser.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/ColladaParser.cpp b/code/ColladaParser.cpp index 9ec05fdd3..97ddd63be 100644 --- a/code/ColladaParser.cpp +++ b/code/ColladaParser.cpp @@ -1250,7 +1250,7 @@ void ColladaParser::ReadSamplerProperties( Sampler& out ) TestClosing( "wrapU"); } else if( IsElement( "wrapV")) { - out.mWrapU = ReadBoolFromTextContent(); + out.mWrapV = ReadBoolFromTextContent(); TestClosing( "wrapV"); } else if( IsElement( "mirrorU")) { @@ -1258,7 +1258,7 @@ void ColladaParser::ReadSamplerProperties( Sampler& out ) TestClosing( "mirrorU"); } else if( IsElement( "mirrorV")) { - out.mMirrorU = ReadBoolFromTextContent(); + out.mMirrorV = ReadBoolFromTextContent(); TestClosing( "mirrorV"); } else if( IsElement( "repeatU")) { @@ -1274,7 +1274,7 @@ void ColladaParser::ReadSamplerProperties( Sampler& out ) TestClosing( "offsetU"); } else if( IsElement( "offsetV")) { - out.mTransform.mTranslation.x = ReadFloatFromTextContent(); + out.mTransform.mTranslation.y = ReadFloatFromTextContent(); TestClosing( "offsetV"); } else if( IsElement( "rotateUV")) {