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

Added null pointer check.

Browse Source 
Added files to CMakeLists.txt
This commit is contained in:
David Williams
2013-06-22 07:24:19 +02:00
parent a14de4a72e
commit 20db75fb75
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
library/PolyVoxCore/CMakeLists.txt
View File

@@ -57,6 +57,7 @@ SET(CORE_INC_FILES
include/PolyVoxCore/DefaultIsQuadNeeded.h include/PolyVoxCore/DefaultIsQuadNeeded.h
include/PolyVoxCore/DefaultMarchingCubesController.h include/PolyVoxCore/DefaultMarchingCubesController.h
include/PolyVoxCore/Density.h include/PolyVoxCore/Density.h
include/PolyVoxCore/FilePager.h
include/PolyVoxCore/GradientEstimators.h include/PolyVoxCore/GradientEstimators.h
include/PolyVoxCore/GradientEstimators.inl include/PolyVoxCore/GradientEstimators.inl
include/PolyVoxCore/Interpolation.h include/PolyVoxCore/Interpolation.h
@@ -72,6 +73,7 @@ SET(CORE_INC_FILES
include/PolyVoxCore/Material.h include/PolyVoxCore/Material.h
include/PolyVoxCore/MaterialDensityPair.h include/PolyVoxCore/MaterialDensityPair.h
include/PolyVoxCore/MinizCompressor.h include/PolyVoxCore/MinizCompressor.h
include/PolyVoxCore/Pager.h
include/PolyVoxCore/PolyVoxForwardDeclarations.h include/PolyVoxCore/PolyVoxForwardDeclarations.h
include/PolyVoxCore/Picking.h include/PolyVoxCore/Picking.h
include/PolyVoxCore/Picking.inl include/PolyVoxCore/Picking.inl

2
library/PolyVoxCore/include/PolyVoxCore/LargeVolume.inl
View File

@@ -533,7 +533,7 @@ namespace PolyVox
template <typename VoxelType> template <typename VoxelType>
void LargeVolume<VoxelType>::eraseBlock(typename std::map<Vector3DInt32, LoadedBlock, BlockPositionCompare>::iterator itBlock) const void LargeVolume<VoxelType>::eraseBlock(typename std::map<Vector3DInt32, LoadedBlock, BlockPositionCompare>::iterator itBlock) const
{ {
//if(m_funcDataOverflowHandler) if(m_pPager)
{ {
Vector3DInt32 v3dPos = itBlock->first; Vector3DInt32 v3dPos = itBlock->first;
Vector3DInt32 v3dLower(v3dPos.getX() << m_uBlockSideLengthPower, v3dPos.getY() << m_uBlockSideLengthPower, v3dPos.getZ() << m_uBlockSideLengthPower); Vector3DInt32 v3dLower(v3dPos.getX() << m_uBlockSideLengthPower, v3dPos.getY() << m_uBlockSideLengthPower, v3dPos.getZ() << m_uBlockSideLengthPower);