Merge branch 'develop' into feature/bounds-checks

2013-05-27 13:00:02 +02:00
parent efd4878450 a56005478d
commit 61dd59c9bc
7 changed files with 219 additions and 129 deletions
--- a/library/PolyVoxCore/include/PolyVoxCore/RawVolume.inl
+++ b/library/PolyVoxCore/include/PolyVoxCore/RawVolume.inl
@@ -201,7 +201,6 @@ namespace PolyVox
 			{
 				//Should never happen
 				POLYVOX_THROW(std::invalid_argument, "Wrap mode parameter has an unrecognised value.");
-				return VoxelType();
 			}
 		}
 	}