godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-07 12:30:27 +00:00
Code Releases 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.
This commit is contained in:
Rémi Verschelde
2020-03-09 10:42:18 +01:00
parent 471271b727
commit da1f80c1f2
224 changed files with 1515 additions and 1928 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
thirdparty/assimp/code/PostProcessing/ProcessHelper.h vendored
View File

@@ -2,7 +2,7 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
Copyright (c) 2006-2020, assimp team
Copyright (c) 2006-2019, assimp team
All rights reserved.
@@ -316,6 +316,12 @@ typedef std::vector <PerVertexWeight> VertexWeightTable;
// Compute a per-vertex bone weight table
VertexWeightTable* ComputeVertexBoneWeightTable(const aiMesh* pMesh);
// -------------------------------------------------------------------------------
// Get a string for a given aiTextureType
const char* TextureTypeToString(aiTextureType in);
// -------------------------------------------------------------------------------
// Get a string for a given aiTextureMapping
const char* MappingTypeToString(aiTextureMapping in);