summaryrefslogtreecommitdiffstats
path: root/thirdparty/assimp/code/PostProcessing/ProcessHelper.cpp
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2020-03-06 16:01:33 +0100
committerGitHub <noreply@github.com>2020-03-06 16:01:33 +0100
commit62afc3c12c2acfbd5f9bbaf93f86111e4d2f3ce0 (patch)
tree501c31a479e01cdca37377404ca728f36a0232d2 /thirdparty/assimp/code/PostProcessing/ProcessHelper.cpp
parent54fa07e7f01b21bc69309172b439bc05db571977 (diff)
parent78b22393a8dd182ee56d0448ed77ba4430de5e75 (diff)
downloadredot-engine-62afc3c12c2acfbd5f9bbaf93f86111e4d2f3ce0.tar.gz
Merge pull request #36852 from akien-mga/assimp-unbundle
assimp: Clean and document buildsystem, update to upstream 0201fc5
Diffstat (limited to 'thirdparty/assimp/code/PostProcessing/ProcessHelper.cpp')
-rw-r--r--thirdparty/assimp/code/PostProcessing/ProcessHelper.cpp42
1 files changed, 1 insertions, 41 deletions
diff --git a/thirdparty/assimp/code/PostProcessing/ProcessHelper.cpp b/thirdparty/assimp/code/PostProcessing/ProcessHelper.cpp
index 59869fdff7..1239864381 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-2019, assimp team
+Copyright (c) 2006-2020, assimp team
All rights reserved.
@@ -230,46 +230,6 @@ 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)
{