From da1f80c1f2d71aeaee9f57fd19fc2ea4f76c487d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Mon, 9 Mar 2020 10:42:18 +0100 Subject: Revert "assimp: Sync with upstream 0201fc5" This reverts commit 78b22393a8dd182ee56d0448ed77ba4430de5e75. It caused a regression in FBX import leading to crashes. Fixes #36908. --- thirdparty/assimp/code/PostProcessing/TextureTransform.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'thirdparty/assimp/code/PostProcessing/TextureTransform.cpp') diff --git a/thirdparty/assimp/code/PostProcessing/TextureTransform.cpp b/thirdparty/assimp/code/PostProcessing/TextureTransform.cpp index bf60e2970f..8ae2ba7218 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-2020, assimp team +Copyright (c) 2006-2019, assimp team All rights reserved. @@ -92,8 +92,9 @@ void TextureTransformStep::PreProcessUVTransform(STransformVecInfo& info) * are applied is - as always - scaling, rotation, translation. */ - int rounded; - char szTemp[512]; + char szTemp[512]; + int rounded = 0; + /* Optimize the rotation angle. That's slightly difficult as * we have an inprecise floating-point number (when comparing @@ -184,6 +185,7 @@ void TextureTransformStep::PreProcessUVTransform(STransformVecInfo& info) info.mTranslation.y = out; } } + return; } // ------------------------------------------------------------------------------------------------ @@ -426,7 +428,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]; + ref[n] = (!mesh->mTextureCoords[n] ? true : false); for (it = trafo.begin();it != trafo.end(); ++it) ref[(*it).uvIndex] = true; -- cgit v1.2.3