Merge branch 'develop' into feature/extractor-optimizations

This commit is contained in:
David Williams 2015-05-24 21:17:19 +02:00
commit efb9844fe2

View File

@ -97,7 +97,7 @@ namespace PolyVox
template <typename VoxelType> template <typename VoxelType>
VoxelType PagedVolume<VoxelType>::Sampler::getVoxel(void) const VoxelType PagedVolume<VoxelType>::Sampler::getVoxel(void) const
{ {
return this->mVolume->getVoxel(this->mXPosInVolume, this->mYPosInVolume, this->mZPosInVolume); return *mCurrentVoxel;
} }
template <typename VoxelType> template <typename VoxelType>