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

2
code/MS3DLoader.cpp
View File

@@ -414,7 +414,7 @@ void MS3DImporter::InternReadFile( const std::string& pFile,
pScene->mMaterials = new aiMaterial*[materials.size()];
for (size_t i = 0; i < materials.size(); ++i) {
MaterialHelper* mo = new MaterialHelper();
aiMaterial* mo = new aiMaterial();
pScene->mMaterials[pScene->mNumMaterials++] = mo;
const TempMaterial& mi = materials[i];