瀏覽代碼

Merge branch 'master' into issue_2206

Kim Kulling 6 年之前
父節點
當前提交
02c6b9b64b
共有 3 個文件被更改,包括 5 次插入1 次删除
  1. 1 0
      code/DropFaceNormalsProcess.cpp
  2. 3 0
      code/PostStepRegistry.cpp
  3. 1 1
      include/assimp/Compiler/pushpack1.h

+ 1 - 0
code/DropFaceNormalsProcess.cpp

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

+ 3 - 0
code/PostStepRegistry.cpp

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

+ 1 - 1
include/assimp/Compiler/pushpack1.h

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