From e97d07ce82bec02b72ed832335820a2b8059ae97 Mon Sep 17 00:00:00 2001 From: escherstair Date: Thu, 8 Nov 2018 09:25:48 +0100 Subject: [PATCH 1/5] add clang to pushpack1.h --- include/assimp/Compiler/pushpack1.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/assimp/Compiler/pushpack1.h b/include/assimp/Compiler/pushpack1.h index 94ee1e474..4c9fbb857 100644 --- a/include/assimp/Compiler/pushpack1.h +++ b/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 From 97450fcb5511886e35ff68e33da3f4060c0186d6 Mon Sep 17 00:00:00 2001 From: mnml_ Date: Thu, 8 Nov 2018 11:44:44 +0100 Subject: [PATCH 2/5] added DropFaceNormalsProcess to out vector --- code/PostStepRegistry.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/PostStepRegistry.cpp b/code/PostStepRegistry.cpp index a04092d3a..646aeaeb0 100644 --- a/code/PostStepRegistry.cpp +++ b/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 From b47739cfb8190328afd5f0394a35c517e5ad8e94 Mon Sep 17 00:00:00 2001 From: escherstair Date: Thu, 8 Nov 2018 11:47:09 +0100 Subject: [PATCH 3/5] build AppVeyor clang_on_Windows branch --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 2b5f212f9..213cbaf75 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -8,7 +8,7 @@ clone_folder: c:\projects\assimp branches: # whitelist only: - - master + - clang_on_Windows matrix: fast_finish: true From d5c9b27af887f2223ca8a0ecf4ce9aac6c0b0f64 Mon Sep 17 00:00:00 2001 From: mnml_ Date: Thu, 8 Nov 2018 12:49:35 +0100 Subject: [PATCH 4/5] delete[] doesnt set nullptr --- code/DropFaceNormalsProcess.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/code/DropFaceNormalsProcess.cpp b/code/DropFaceNormalsProcess.cpp index 3800fee0b..57e8b972b 100644 --- a/code/DropFaceNormalsProcess.cpp +++ b/code/DropFaceNormalsProcess.cpp @@ -104,5 +104,6 @@ bool DropFaceNormalsProcess::DropMeshFaceNormals (aiMesh* pMesh) { } delete[] pMesh->mNormals; + pMesh->mNormals = nullptr; return true; } From deb9eb974b09fbb6904aa32657ff2e5a74efb8c8 Mon Sep 17 00:00:00 2001 From: escherstair Date: Thu, 8 Nov 2018 13:40:04 +0100 Subject: [PATCH 5/5] Update appveyor.yml --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 213cbaf75..2b5f212f9 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -8,7 +8,7 @@ clone_folder: c:\projects\assimp branches: # whitelist only: - - clang_on_Windows + - master matrix: fast_finish: true