v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into issue_2206

pull/2211/head
Kim Kulling 2018-11-09 13:13:52 +01:00 committed by GitHub
parent e787604ff1 2d1f34f191
commit 02c6b9b64b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
code/DropFaceNormalsProcess.cpp
View File

@ -104,5 +104,6 @@ bool DropFaceNormalsProcess::DropMeshFaceNormals (aiMesh* pMesh) {
} }
delete[] pMesh->mNormals; delete[] pMesh->mNormals;
pMesh->mNormals = nullptr;
return true; return true;
} }

3
code/PostStepRegistry.cpp
View File

@ -203,6 +203,9 @@ void GetPostProcessingStepInstanceList(std::vector< BaseProcess* >& out)
#if (!defined ASSIMP_BUILD_NO_SPLITLARGEMESHES_PROCESS) #if (!defined ASSIMP_BUILD_NO_SPLITLARGEMESHES_PROCESS)
out.push_back( new SplitLargeMeshesProcess_Triangle()); out.push_back( new SplitLargeMeshesProcess_Triangle());
#endif #endif
#if (!defined ASSIMP_BUILD_NO_GENFACENORMALS_PROCESS)
out.push_back( new DropFaceNormalsProcess());
#endif
#if (!defined ASSIMP_BUILD_NO_GENFACENORMALS_PROCESS) #if (!defined ASSIMP_BUILD_NO_GENFACENORMALS_PROCESS)
out.push_back( new GenFaceNormalsProcess()); out.push_back( new GenFaceNormalsProcess());
#endif #endif

2
include/assimp/Compiler/pushpack1.h
View File

@ -25,7 +25,7 @@
#if defined(_MSC_VER) || defined(__BORLANDC__) || defined (__BCPLUSPLUS__) #if defined(_MSC_VER) || defined(__BORLANDC__) || defined (__BCPLUSPLUS__)
# pragma pack(push,1) # pragma pack(push,1)
# define PACK_STRUCT # define PACK_STRUCT
#elif defined( __GNUC__ ) #elif defined( __GNUC__ ) || defined(__clang__)
# if !defined(HOST_MINGW) # if !defined(HOST_MINGW)
# define PACK_STRUCT __attribute__((__packed__)) # define PACK_STRUCT __attribute__((__packed__))
# else # else