correct indentation and some whitespace edits (no functional changes)

13 files changed, 61 insertions, 57 deletions

diff --git a/source/gameengine/Converter/BL_ShapeActionActuator.cpp b/source/gameengine/Converter/BL_ShapeActionActuator.cpp
index ecf9427eddd..aa62479d420 100644
--- a/source/gameengine/Converter/BL_ShapeActionActuator.cpp
+++ b/source/gameengine/Converter/BL_ShapeActionActuator.cpp
@@ -177,8 +177,9 @@ void BL_ShapeActionActuator::BlendShape(Key* key, float srcweight)
 	dstweight = 1.0F - srcweight;
 
 	for (it=m_blendshape.begin(), kb = (KeyBlock*)key->block.first; 
-		 kb && it != m_blendshape.end(); 
-		 kb = (KeyBlock*)kb->next, it++) {
+	     kb && it != m_blendshape.end();
+	     kb = (KeyBlock*)kb->next, it++)
+	{
 		kb->curval = kb->curval * dstweight + (*it) * srcweight;
 	}
 }
diff --git a/source/gameengine/Expressions/IntValue.h b/source/gameengine/Expressions/IntValue.h
index bae3eb11298..e6802b6ad04 100644
--- a/source/gameengine/Expressions/IntValue.h
+++ b/source/gameengine/Expressions/IntValue.h
@@ -36,8 +36,8 @@ public:
 	CIntValue();
 	CIntValue(cInt innie);
 	CIntValue(cInt innie,
-			  const char *name,
-			  AllocationTYPE alloctype=CValue::HEAPVALUE);
+	          const char *name,
+	          AllocationTYPE alloctype=CValue::HEAPVALUE);
 	
 	virtual	CValue* Calc(VALUE_OPERATOR op,
 						 CValue *val);
diff --git a/source/gameengine/GameLogic/SCA_MouseSensor.h b/source/gameengine/GameLogic/SCA_MouseSensor.h
index 4bac9c10e13..91352ce58bc 100644
--- a/source/gameengine/GameLogic/SCA_MouseSensor.h
+++ b/source/gameengine/GameLogic/SCA_MouseSensor.h
@@ -88,9 +88,9 @@ class SCA_MouseSensor : public SCA_ISensor
 	bool isValid(KX_MOUSESENSORMODE);
 	
 	SCA_MouseSensor(class SCA_MouseManager* keybdmgr,
-					int startx,int starty,
-				   short int mousemode,
-				   SCA_IObject* gameobj);
+	                int startx,int starty,
+	                short int mousemode,
+	                SCA_IObject* gameobj);
 
 	virtual ~SCA_MouseSensor();
 	virtual CValue* GetReplica();
diff --git a/source/gameengine/GamePlayer/common/GPC_Canvas.cpp b/source/gameengine/GamePlayer/common/GPC_Canvas.cpp
index cc7630b7afd..df1bf31ec12 100644
--- a/source/gameengine/GamePlayer/common/GPC_Canvas.cpp
+++ b/source/gameengine/GamePlayer/common/GPC_Canvas.cpp
@@ -451,14 +451,14 @@ MakeScreenShot(
 
 	// png image settings
 	png_set_IHDR(png_ptr,
-		 info_ptr,
-		 GetWidth(),
-		 GetHeight(),
-		 8,
-		 color_type,
-		 PNG_INTERLACE_NONE,
-		 PNG_COMPRESSION_TYPE_DEFAULT,
-		 PNG_FILTER_TYPE_DEFAULT);
+	             info_ptr,
+	             GetWidth(),
+	             GetHeight(),
+	             8,
+	             color_type,
+	             PNG_INTERLACE_NONE,
+	             PNG_COMPRESSION_TYPE_DEFAULT,
+	             PNG_FILTER_TYPE_DEFAULT);
 
 	// write the file header information
 	png_write_info(png_ptr, info_ptr);
diff --git a/source/gameengine/Ketsji/BL_Action.cpp b/source/gameengine/Ketsji/BL_Action.cpp
index 931e5412338..1d5a3dd461a 100644
--- a/source/gameengine/Ketsji/BL_Action.cpp
+++ b/source/gameengine/Ketsji/BL_Action.cpp
@@ -309,8 +309,9 @@ void BL_Action::BlendShape(Key* key, float srcweight, std::vector<float>& blends
 	dstweight = 1.0F - srcweight;
 	//printf("Dst: %f\tSrc: %f\n", srcweight, dstweight);
 	for (it=blendshape.begin(), kb = (KeyBlock*)key->block.first; 
-		 kb && it != blendshape.end(); 
-		 kb = (KeyBlock*)kb->next, it++) {
+	     kb && it != blendshape.end();
+	     kb = (KeyBlock*)kb->next, it++)
+	{
 		//printf("OirgKeys: %f\t%f\n", kb->curval, (*it));
 		kb->curval = kb->curval * dstweight + (*it) * srcweight;
 		//printf("NewKey: %f\n", kb->curval);
diff --git a/source/gameengine/Ketsji/BL_Shader.cpp b/source/gameengine/Ketsji/BL_Shader.cpp
index aea33246a3f..682b42cc3cf 100644
--- a/source/gameengine/Ketsji/BL_Shader.cpp
+++ b/source/gameengine/Ketsji/BL_Shader.cpp
@@ -451,7 +451,7 @@ void BL_Shader::Update( const RAS_MeshSlot & ms, RAS_IRasterizer* rasty )
 		const MT_Matrix4x4& view = rasty->GetViewMatrix();
 
 		if(mAttr==SHD_TANGENT)
-			 ms.m_mesh->SetMeshModified(true);
+			ms.m_mesh->SetMeshModified(true);
 
 		BL_UniformVecDef::iterator it;
 		for(it = mPreDef.begin(); it!= mPreDef.end(); it++)
diff --git a/source/gameengine/Ketsji/KX_Dome.cpp b/source/gameengine/Ketsji/KX_Dome.cpp
index 44cfd4bddbc..828c327a228 100644
--- a/source/gameengine/Ketsji/KX_Dome.cpp
+++ b/source/gameengine/Ketsji/KX_Dome.cpp
@@ -425,21 +425,21 @@ void KX_Dome::GLDrawWarpQuads(void)
 				if (warp.nodes[i][j].i < 0 || warp.nodes[i2][j].i < 0 || warp.nodes[i2][j+1].i < 0 || warp.nodes[i][j+1].i < 0)
 					continue;
 
-				 glColor3f(warp.nodes[i][j].i,warp.nodes[i][j].i,warp.nodes[i][j].i);
-				 glTexCoord2f((warp.nodes[i][j].u * uv_width), (warp.nodes[i][j].v * uv_height));
-				 glVertex3f(warp.nodes[i][j].x,warp.nodes[i][j].y,0.0);
+				glColor3f(warp.nodes[i][j].i,warp.nodes[i][j].i,warp.nodes[i][j].i);
+				glTexCoord2f((warp.nodes[i][j].u * uv_width), (warp.nodes[i][j].v * uv_height));
+				glVertex3f(warp.nodes[i][j].x,warp.nodes[i][j].y,0.0);
 
-				 glColor3f(warp.nodes[i2][j].i,warp.nodes[i2][j].i,warp.nodes[i2][j].i);
-				 glTexCoord2f((warp.nodes[i2][j].u * uv_width), (warp.nodes[i2][j].v * uv_height));
-				 glVertex3f(warp.nodes[i2][j].x,warp.nodes[i2][j].y,0.0);
+				glColor3f(warp.nodes[i2][j].i,warp.nodes[i2][j].i,warp.nodes[i2][j].i);
+				glTexCoord2f((warp.nodes[i2][j].u * uv_width), (warp.nodes[i2][j].v * uv_height));
+				glVertex3f(warp.nodes[i2][j].x,warp.nodes[i2][j].y,0.0);
 
-				 glColor3f(warp.nodes[i2][j+1].i,warp.nodes[i2][j+1].i,warp.nodes[i2][j+1].i);
-				 glTexCoord2f((warp.nodes[i2][j+1].u * uv_width), (warp.nodes[i2][j+1].v * uv_height));
-				 glVertex3f(warp.nodes[i2][j+1].x,warp.nodes[i2][j+1].y,0.0);
+				glColor3f(warp.nodes[i2][j+1].i,warp.nodes[i2][j+1].i,warp.nodes[i2][j+1].i);
+				glTexCoord2f((warp.nodes[i2][j+1].u * uv_width), (warp.nodes[i2][j+1].v * uv_height));
+				glVertex3f(warp.nodes[i2][j+1].x,warp.nodes[i2][j+1].y,0.0);
 
-				 glColor3f(warp.nodes[i2][j+1].i,warp.nodes[i2][j+1].i,warp.nodes[i2][j+1].i);
-				 glTexCoord2f((warp.nodes[i2][j+1].u * uv_width), (warp.nodes[i2][j+1].v * uv_height));
-				 glVertex3f(warp.nodes[i2][j+1].x,warp.nodes[i2][j+1].y,0.0);
+				glColor3f(warp.nodes[i2][j+1].i,warp.nodes[i2][j+1].i,warp.nodes[i2][j+1].i);
+				glTexCoord2f((warp.nodes[i2][j+1].u * uv_width), (warp.nodes[i2][j+1].v * uv_height));
+				glVertex3f(warp.nodes[i2][j+1].x,warp.nodes[i2][j+1].y,0.0);
 
 			}
 		}
diff --git a/source/gameengine/Ketsji/KX_IpoActuator.h b/source/gameengine/Ketsji/KX_IpoActuator.h
index fa26bbaa6e1..6b172ba8603 100644
--- a/source/gameengine/Ketsji/KX_IpoActuator.h
+++ b/source/gameengine/Ketsji/KX_IpoActuator.h
@@ -123,15 +123,15 @@ public:
 	int m_type;
 
 	KX_IpoActuator(SCA_IObject* gameobj,
-				   const STR_String& propname,
-				   const STR_String& framePropname,
-				   float starttime,
-				   float endtime,
-				   bool recurse,
-				   int acttype,
-				   bool ipo_as_force, 
-				   bool ipo_add,
-				   bool ipo_local);
+	               const STR_String& propname,
+	               const STR_String& framePropname,
+	               float starttime,
+	               float endtime,
+	               bool recurse,
+	               int acttype,
+	               bool ipo_as_force,
+	               bool ipo_add,
+	               bool ipo_local);
 	virtual ~KX_IpoActuator() {};
 
 	virtual CValue* GetReplica() {
diff --git a/source/gameengine/Ketsji/KX_MouseFocusSensor.h b/source/gameengine/Ketsji/KX_MouseFocusSensor.h
index 277af87f9f2..43bf6bc5302 100644
--- a/source/gameengine/Ketsji/KX_MouseFocusSensor.h
+++ b/source/gameengine/Ketsji/KX_MouseFocusSensor.h
@@ -121,7 +121,7 @@ class KX_MouseFocusSensor : public SCA_MouseSensor
 	/**
 	 * The focus mode. 1 for handling focus, 0 for not handling, 2 for focus on any object
 	*/
-	 int	m_focusmode;
+	int	m_focusmode;
 
 	/**
 	 * Flags whether the previous test showed a mouse-over.
diff --git a/source/gameengine/Ketsji/KX_NearSensor.h b/source/gameengine/Ketsji/KX_NearSensor.h
index 26adcb993b8..a81d621e8fc 100644
--- a/source/gameengine/Ketsji/KX_NearSensor.h
+++ b/source/gameengine/Ketsji/KX_NearSensor.h
@@ -49,12 +49,12 @@ protected:
 	KX_ClientObjectInfo*	m_client_info;
 public:
 	KX_NearSensor(class SCA_EventManager* eventmgr,
-			class KX_GameObject* gameobj,
-			float margin,
-			float resetmargin,
-			bool bFindMaterial,
-			const STR_String& touchedpropname,
-			 PHY_IPhysicsController*	ctrl);
+	              class KX_GameObject* gameobj,
+	              float margin,
+	              float resetmargin,
+	              bool bFindMaterial,
+	              const STR_String& touchedpropname,
+	              PHY_IPhysicsController*	ctrl);
 /*
 public:
 	KX_NearSensor(class SCA_EventManager* eventmgr,
diff --git a/source/gameengine/Ketsji/KX_Scene.cpp b/source/gameengine/Ketsji/KX_Scene.cpp
index 9b8f7f27d80..20743504dad 100644
--- a/source/gameengine/Ketsji/KX_Scene.cpp
+++ b/source/gameengine/Ketsji/KX_Scene.cpp
@@ -1247,9 +1247,10 @@ KX_Camera* KX_Scene::FindCamera(KX_Camera* cam)
 {
 	list<KX_Camera*>::iterator it = m_cameras.begin();
 
-	while ( (it != m_cameras.end()) 
-			&& ((*it) != cam) ) {
-	  it++;
+	while ( (it != m_cameras.end())
+	        && ((*it) != cam) )
+	{
+		it++;
 	}
 
 	return ((it == m_cameras.end()) ? NULL : (*it));
@@ -1260,9 +1261,10 @@ KX_Camera* KX_Scene::FindCamera(STR_String& name)
 {
 	list<KX_Camera*>::iterator it = m_cameras.begin();
 
-	while ( (it != m_cameras.end()) 
-			&& ((*it)->GetName() != name) ) {
-	  it++;
+	while ( (it != m_cameras.end())
+	        && ((*it)->GetName() != name) )
+	{
+		it++;
 	}
 
 	return ((it == m_cameras.end()) ? NULL : (*it));
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
index 76bdd36a70f..22aa781ebc2 100644
--- a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
+++ b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
@@ -2130,8 +2130,8 @@ btCollisionShape* CcdShapeConstructionInfo::CreateBulletShape(btScalar margin, b
 		{
 			compoundShape = new btCompoundShape();
 			for (std::vector<CcdShapeConstructionInfo*>::iterator sit = m_shapeArray.begin();
-				 sit != m_shapeArray.end();
-				 sit++)
+			     sit != m_shapeArray.end();
+			     sit++)
 			{
 				collisionShape = (*sit)->CreateBulletShape(margin, useGimpact, useBvh);
 				if (collisionShape)
@@ -2156,8 +2156,8 @@ void CcdShapeConstructionInfo::AddShape(CcdShapeConstructionInfo* shapeInfo)
 CcdShapeConstructionInfo::~CcdShapeConstructionInfo()
 {
 	for (std::vector<CcdShapeConstructionInfo*>::iterator sit = m_shapeArray.begin();
-		 sit != m_shapeArray.end();
-		 sit++)
+	     sit != m_shapeArray.end();
+	     sit++)
 	{
 		(*sit)->Release();
 	}
diff --git a/source/gameengine/VideoTexture/Texture.h b/source/gameengine/VideoTexture/Texture.h
index 4dce0021509..32801a2c38e 100644
--- a/source/gameengine/VideoTexture/Texture.h
+++ b/source/gameengine/VideoTexture/Texture.h
@@ -79,7 +79,7 @@ extern PyTypeObject TextureType;
 
 // load texture
 void loadTexture (unsigned int texId, unsigned int * texture, short * size,
-				  bool mipmap = false);
+                  bool mipmap = false);
 
 // get material
 RAS_IPolyMaterial * getMaterial (PyObject *obj, short matID);