From 20db75fb753b623b912fecc35e8d2b08418af814 Mon Sep 17 00:00:00 2001 From: David Williams Date: Sat, 22 Jun 2013 07:24:19 +0200 Subject: [PATCH] Added null pointer check. Added files to CMakeLists.txt --- library/PolyVoxCore/CMakeLists.txt | 2 ++ library/PolyVoxCore/include/PolyVoxCore/LargeVolume.inl | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/library/PolyVoxCore/CMakeLists.txt b/library/PolyVoxCore/CMakeLists.txt index 2c352a50..8366d527 100644 --- a/library/PolyVoxCore/CMakeLists.txt +++ b/library/PolyVoxCore/CMakeLists.txt @@ -57,6 +57,7 @@ SET(CORE_INC_FILES include/PolyVoxCore/DefaultIsQuadNeeded.h include/PolyVoxCore/DefaultMarchingCubesController.h include/PolyVoxCore/Density.h + include/PolyVoxCore/FilePager.h include/PolyVoxCore/GradientEstimators.h include/PolyVoxCore/GradientEstimators.inl include/PolyVoxCore/Interpolation.h @@ -72,6 +73,7 @@ SET(CORE_INC_FILES include/PolyVoxCore/Material.h include/PolyVoxCore/MaterialDensityPair.h include/PolyVoxCore/MinizCompressor.h + include/PolyVoxCore/Pager.h include/PolyVoxCore/PolyVoxForwardDeclarations.h include/PolyVoxCore/Picking.h include/PolyVoxCore/Picking.inl diff --git a/library/PolyVoxCore/include/PolyVoxCore/LargeVolume.inl b/library/PolyVoxCore/include/PolyVoxCore/LargeVolume.inl index 7201836a..6322135b 100644 --- a/library/PolyVoxCore/include/PolyVoxCore/LargeVolume.inl +++ b/library/PolyVoxCore/include/PolyVoxCore/LargeVolume.inl @@ -533,7 +533,7 @@ namespace PolyVox template void LargeVolume::eraseBlock(typename std::map::iterator itBlock) const { - //if(m_funcDataOverflowHandler) + if(m_pPager) { Vector3DInt32 v3dPos = itBlock->first; Vector3DInt32 v3dLower(v3dPos.getX() << m_uBlockSideLengthPower, v3dPos.getY() << m_uBlockSideLengthPower, v3dPos.getZ() << m_uBlockSideLengthPower);