TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-12 07:04:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'AssimpWIP' of https://github.com/Areloch/Torque3D into development

Browse source
This commit is contained in:
Areloch 2019-05-04 16:25:16 -05:00
commit a928744b73
909 changed files with 367086 additions and 2721 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Engine/source/ts/collada/colladaAppMaterial.cpp
View file

@ -30,7 +30,9 @@
using namespace ColladaUtils;
String cleanString(const String& str)
#ifndef TORQUE_ASSIMP
String AppMaterial::cleanString(const String& str)
{
String cleanStr(str);
@ -46,6 +48,8 @@ String cleanString(const String& str)
return cleanStr;
}
#endif // !TORQUE_ASSIMP
//------------------------------------------------------------------------------
ColladaAppMaterial::ColladaAppMaterial(const char* matName)