Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- extract MaterialHelper and move all of its members to aiMaterial in /include.

Browse Source 
- pull in IOhannes' patch to set the gcc default visibility for all symbols to NO and to mark ASSIMP_API with __attribute__ ((visibility("default"))).
- drop unneeded ASSIMP_API from most internal classes in /code, we just need to keep some exports on Windows to keep AssimpView alive.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1066 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
This commit is contained in:
aramis_acg
2011-08-22 20:22:51 +00:00
parent 9f32504792
commit 9d85c8834d
111 changed files with 1867 additions and 1935 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/SMDLoader.cpp
View File

@@ -625,7 +625,7 @@ void SMDImporter::CreateOutputMaterials()
for (unsigned int iMat = 0; iMat < pScene->mNumMaterials;++iMat)
{
MaterialHelper* pcMat = new MaterialHelper();
aiMaterial* pcMat = new aiMaterial();
pScene->mMaterials[iMat] = pcMat;
aiString szName;
@@ -645,7 +645,7 @@ void SMDImporter::CreateOutputMaterials()
{
pScene->mNumMaterials = 1;
MaterialHelper* pcHelper = new MaterialHelper();
aiMaterial* pcHelper = new aiMaterial();
pScene->mMaterials[0] = pcHelper;
int iMode = (int)aiShadingMode_Gouraud;