diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2020-03-09 10:42:18 +0100 |
---|---|---|
committer | Rémi Verschelde <rverschelde@gmail.com> | 2020-03-09 10:42:18 +0100 |
commit | da1f80c1f2d71aeaee9f57fd19fc2ea4f76c487d (patch) | |
tree | e7f0d1caae79f594d43be8d5068a04c285e2c5bc /thirdparty/assimp/code/PostProcessing/ProcessHelper.cpp | |
parent | 471271b727fd1dcc716a10f34e615ce61ca6d16e (diff) | |
download | redot-engine-da1f80c1f2d71aeaee9f57fd19fc2ea4f76c487d.tar.gz |
Revert "assimp: Sync with upstream 0201fc5"
This reverts commit 78b22393a8dd182ee56d0448ed77ba4430de5e75.
It caused a regression in FBX import leading to crashes.
Fixes #36908.
Diffstat (limited to 'thirdparty/assimp/code/PostProcessing/ProcessHelper.cpp')
-rw-r--r-- | thirdparty/assimp/code/PostProcessing/ProcessHelper.cpp | 42 |
1 files changed, 41 insertions, 1 deletions
diff --git a/thirdparty/assimp/code/PostProcessing/ProcessHelper.cpp b/thirdparty/assimp/code/PostProcessing/ProcessHelper.cpp index 1239864381..59869fdff7 100644 --- a/thirdparty/assimp/code/PostProcessing/ProcessHelper.cpp +++ b/thirdparty/assimp/code/PostProcessing/ProcessHelper.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. @@ -230,6 +230,46 @@ VertexWeightTable* ComputeVertexBoneWeightTable(const aiMesh* pMesh) return avPerVertexWeights; } + +// ------------------------------------------------------------------------------- +const char* TextureTypeToString(aiTextureType in) +{ + switch (in) + { + case aiTextureType_NONE: + return "n/a"; + case aiTextureType_DIFFUSE: + return "Diffuse"; + case aiTextureType_SPECULAR: + return "Specular"; + case aiTextureType_AMBIENT: + return "Ambient"; + case aiTextureType_EMISSIVE: + return "Emissive"; + case aiTextureType_OPACITY: + return "Opacity"; + case aiTextureType_NORMALS: + return "Normals"; + case aiTextureType_HEIGHT: + return "Height"; + case aiTextureType_SHININESS: + return "Shininess"; + case aiTextureType_DISPLACEMENT: + return "Displacement"; + case aiTextureType_LIGHTMAP: + return "Lightmap"; + case aiTextureType_REFLECTION: + return "Reflection"; + case aiTextureType_UNKNOWN: + return "Unknown"; + default: + break; + } + + ai_assert(false); + return "BUG"; +} + // ------------------------------------------------------------------------------- const char* MappingTypeToString(aiTextureMapping in) { |