AnotherFoxGuy/polyvox
1
0
Fork 0
Code Issues Pull Requests Activity

Merge branch 'develop' into feature/cubiquity-version

Browse Source
This commit is contained in:
David Williams
2013-02-07 23:02:23 +01:00
parent dadcf03d8d c3801db4e2
commit a38ac6b895
50 changed files with 6138 additions and 430 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
library/PolyVoxCore/source/Region.cpp
View File

@ -23,7 +23,6 @@ freely, subject to the following restrictions:
#include "PolyVoxCore/Region.h"
#include <cassert>
#include <limits>
namespace PolyVox
@ -79,7 +78,7 @@ namespace PolyVox
*/
void Region::accumulate(const Region& reg)
{
assert(reg.isValid()); //The result of accumulating an invalid region is not defined.
POLYVOX_ASSERT(reg.isValid(), "You cannot accumulate an invalid region."); //The result of accumulating an invalid region is not defined.
m_iLowerX = ((std::min)(m_iLowerX, reg.getLowerX()));
m_iLowerY = ((std::min)(m_iLowerY, reg.getLowerY()));