From 1dd37c8a7a792ec8c0c7ec8e0c9c3ddd62d5c11e Mon Sep 17 00:00:00 2001
From: unknown <David@David-Laptop.(none)>
Date: Sun, 15 Jul 2012 21:27:04 +0200
Subject: [PATCH] Renamed parameters as 'from' is a reserved word in Python.

---
 library/PolyVoxCore/include/PolyVoxCore/Material.h          | 6 +++---
 .../PolyVoxCore/include/PolyVoxCore/MaterialDensityPair.h   | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/library/PolyVoxCore/include/PolyVoxCore/Material.h b/library/PolyVoxCore/include/PolyVoxCore/Material.h
index cd22abb7..9e4d98fa 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/Material.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/Material.h
@@ -75,11 +75,11 @@ namespace PolyVox
 		MaterialType getMaterial() const throw() { return m_uMaterial; }
 		void setMaterial(MaterialType uMaterial) { m_uMaterial = uMaterial; }
 
-		static bool isQuadNeeded(Material<Type> from, Material<Type> to, float& materialToUse)
+		static bool isQuadNeeded(Material<Type> back, Material<Type> front, float& materialToUse)
 		{
-			if((from.getMaterial() > 0) && (to.getMaterial() == 0))
+			if((back.getMaterial() > 0) && (front.getMaterial() == 0))
 			{
-				materialToUse = static_cast<float>(from.getMaterial());
+				materialToUse = static_cast<float>(back.getMaterial());
 				return true;
 			}
 			else
diff --git a/library/PolyVoxCore/include/PolyVoxCore/MaterialDensityPair.h b/library/PolyVoxCore/include/PolyVoxCore/MaterialDensityPair.h
index 8ce8db43..58d53659 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/MaterialDensityPair.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/MaterialDensityPair.h
@@ -96,11 +96,11 @@ namespace PolyVox
 		static DensityType getMaxDensity() throw() { return (0x01 << NoOfDensityBits) - 1; }
 		static DensityType getMinDensity() throw() { return 0; }
 
-		static bool isQuadNeeded(MaterialDensityPair<Type, NoOfMaterialBits, NoOfDensityBits> from, MaterialDensityPair<Type, NoOfMaterialBits, NoOfDensityBits> to, float& materialToUse)
+		static bool isQuadNeeded(MaterialDensityPair<Type, NoOfMaterialBits, NoOfDensityBits> back, MaterialDensityPair<Type, NoOfMaterialBits, NoOfDensityBits> front, float& materialToUse)
 		{
-			if((from.getMaterial() > 0) && (to.getMaterial() == 0))
+			if((back.getMaterial() > 0) && (front.getMaterial() == 0))
 			{
-				materialToUse = static_cast<float>(from.getMaterial());
+				materialToUse = static_cast<float>(back.getMaterial());
 				return true;
 			}
 			else