From 9ff95f7061eebe00e29db6607d5f00804d3eb1dd Mon Sep 17 00:00:00 2001 From: David Williams Date: Thu, 11 Jul 2013 15:55:34 +0200 Subject: [PATCH] Minor fixes. --- library/PolyVoxCore/include/PolyVoxCore/LargeVolume.inl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/library/PolyVoxCore/include/PolyVoxCore/LargeVolume.inl b/library/PolyVoxCore/include/PolyVoxCore/LargeVolume.inl index 794b283f..e8194b2f 100644 --- a/library/PolyVoxCore/include/PolyVoxCore/LargeVolume.inl +++ b/library/PolyVoxCore/include/PolyVoxCore/LargeVolume.inl @@ -646,7 +646,7 @@ namespace PolyVox if((v3dBlockPos == m_v3dLastAccessedBlockPos) && (m_pLastAccessedBlock != 0)) { return m_pLastAccessedBlock; - } + } //Get the block and mark that we accessed it Block* block = getCompressedBlock(uBlockX, uBlockY, uBlockZ); @@ -672,9 +672,11 @@ namespace PolyVox itUncompressedBlock = m_pUncompressedBlockCache.insert(std::make_pair(v3dBlockPos, pUncompressedBlock)).first; } - m_pLastAccessedBlock = block->m_tUncompressedData; + m_pLastAccessedBlock = (*itUncompressedBlock).second; m_v3dLastAccessedBlockPos = v3dBlockPos; + return m_pLastAccessedBlock; + if(block->hasUncompressedData()) { return block->m_tUncompressedData;