Merge branch 'master' of git@gitorious.org:polyvox/polyvox.git

2012-06-15 16:34:58 +02:00
parent 7f38e87ade 5985aa5ec2
commit c11b02f354
12 changed files with 89 additions and 90 deletions
--- a/library/PolyVoxCore/source/Density.cpp
+++ b/library/PolyVoxCore/source/Density.cpp
@ -26,7 +26,7 @@ freely, subject to the following restrictions:
 namespace PolyVox
 {
 	template<>
-	typename VoxelTypeTraits<Density8>::DensityType convertToDensity(Density8 voxel)
+	VoxelTypeTraits<Density8>::DensityType convertToDensity(Density8 voxel)
 	{
 		return voxel.getDensity();
 	}