Explorar o código

Merge pull request #643 from Srekel/master

Fix for assert in VS2015 debug builds (and likely others too). ( Expr…
Branimir Karadžić %!s(int64=10) %!d(string=hai) anos
pai
achega
68fa35bfa6
Modificáronse 1 ficheiros con 1 adicións e 1 borrados
  1. 1 1
      3rdparty/forsyth-too/forsythtriangleorderoptimizer.cpp

+ 1 - 1
3rdparty/forsyth-too/forsythtriangleorderoptimizer.cpp

@@ -293,7 +293,7 @@ namespace Forsyth
 
                 assert(vertexData.activeFaceListSize > 0);
                 uint* begin = &activeFaceList[vertexData.activeFaceListStart];
-                uint* end = &activeFaceList[vertexData.activeFaceListStart + vertexData.activeFaceListSize];
+				uint* end = &(activeFaceList[vertexData.activeFaceListStart + vertexData.activeFaceListSize - 1]) + 1;
                 uint* it = std::find(begin, end, bestFace);
                 assert(it != end);
                 std::swap(*it, *(end-1));