summaryrefslogtreecommitdiff
path: root/thirdparty/assimp/code/PostProcessing/TextureTransform.cpp
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2020-03-06 14:42:31 +0100
committerRémi Verschelde <rverschelde@gmail.com>2020-03-06 14:43:31 +0100
commit78b22393a8dd182ee56d0448ed77ba4430de5e75 (patch)
treeb117ded652a479692041ba5cafba15cfc2a754b5 /thirdparty/assimp/code/PostProcessing/TextureTransform.cpp
parent9d8a9ea826ac733e7076d567ef2a6b5200de68c4 (diff)
assimp: Sync with upstream 0201fc5
Diffstat (limited to 'thirdparty/assimp/code/PostProcessing/TextureTransform.cpp')
-rw-r--r--thirdparty/assimp/code/PostProcessing/TextureTransform.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/thirdparty/assimp/code/PostProcessing/TextureTransform.cpp b/thirdparty/assimp/code/PostProcessing/TextureTransform.cpp
index 8ae2ba7218..bf60e2970f 100644
--- a/thirdparty/assimp/code/PostProcessing/TextureTransform.cpp
+++ b/thirdparty/assimp/code/PostProcessing/TextureTransform.cpp
@@ -2,7 +2,7 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2019, assimp team
+Copyright (c) 2006-2020, assimp team
All rights reserved.
@@ -92,9 +92,8 @@ void TextureTransformStep::PreProcessUVTransform(STransformVecInfo& info)
* are applied is - as always - scaling, rotation, translation.
*/
- char szTemp[512];
- int rounded = 0;
-
+ int rounded;
+ char szTemp[512];
/* Optimize the rotation angle. That's slightly difficult as
* we have an inprecise floating-point number (when comparing
@@ -185,7 +184,6 @@ void TextureTransformStep::PreProcessUVTransform(STransformVecInfo& info)
info.mTranslation.y = out;
}
}
- return;
}
// ------------------------------------------------------------------------------------------------
@@ -428,7 +426,7 @@ void TextureTransformStep::Execute( aiScene* pScene)
// at the end of the list
bool ref[AI_MAX_NUMBER_OF_TEXTURECOORDS];
for (unsigned int n = 0; n < AI_MAX_NUMBER_OF_TEXTURECOORDS;++n)
- ref[n] = (!mesh->mTextureCoords[n] ? true : false);
+ ref[n] = !mesh->mTextureCoords[n];
for (it = trafo.begin();it != trafo.end(); ++it)
ref[(*it).uvIndex] = true;