Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-08 17:41:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert "assimp: Sync with upstream 0201fc5"

Browse source 
This reverts commit 78b22393a8.

It caused a regression in FBX import leading to crashes.
Fixes #36908.

(cherry picked from commit da1f80c1f2)
This commit is contained in:
Rémi Verschelde 2020-03-09 10:42:18 +01:00
parent 398de05dd6
commit 10012f9d49
224 changed files with 1515 additions and 1928 deletions
Download patch file Download diff file Expand all files Collapse all files

6
thirdparty/assimp/code/Common/VertexTriangleAdjacency.cpp vendored
View file

@ -3,7 +3,7 @@
Open Asset Import Library (assimp)
---------------------------------------------------------------------------
Copyright (c) 2006-2020, assimp team
Copyright (c) 2006-2019, assimp team
@ -58,7 +58,7 @@ VertexTriangleAdjacency::VertexTriangleAdjacency(aiFace *pcFaces,
{
// compute the number of referenced vertices if it wasn't specified by the caller
const aiFace* const pcFaceEnd = pcFaces + iNumFaces;
if (0 == iNumVertices) {
if (!iNumVertices) {
for (aiFace* pcFace = pcFaces; pcFace != pcFaceEnd; ++pcFace) {
ai_assert( nullptr != pcFace );
ai_assert(3 == pcFace->mNumIndices);
@ -68,7 +68,7 @@ VertexTriangleAdjacency::VertexTriangleAdjacency(aiFace *pcFaces,
}
}
mNumVertices = iNumVertices + 1;
mNumVertices = iNumVertices;
unsigned int* pi;