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

Revert

pull/2045/head
Doron Adler 2018-07-01 13:10:44 +03:00
parent 6e346a5504
commit 6a45f84b73
2 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -40,10 +40,6 @@ PROJECT( Assimp )
# All supported options ###############################################
if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE "Release")
endif()
OPTION( BUILD_SHARED_LIBS
"Build package with shared libraries."
ON
@ -340,9 +336,7 @@ ENDIF(NOT ZLIB_FOUND)
INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR})
# Search for unzip
IF (NOT IOS)
use_pkgconfig(UNZIP minizip)
ENDIF (NOT IOS)
IF ( ASSIMP_NO_EXPORT )
ADD_DEFINITIONS( -DASSIMP_BUILD_NO_EXPORT)

5
code/TriangulateProcess.cpp
View File

@ -287,10 +287,7 @@ bool TriangulateProcess::TriangulateMesh( aiMesh* pMesh)
// We project it onto a plane to get a 2d triangle.
// Collect all vertices of of the polygon.
// size of temp_verts3d is (max_out+2);
// max = (int)face.mNumIndices
int smallerMax = (max<=((int)max_out+2))?(max):((int)max_out+2);
for (tmp = 0; tmp < smallerMax; ++tmp) {
for (tmp = 0; tmp < max; ++tmp) {
temp_verts3d[tmp] = verts[idx[tmp]];
}