[Bf-blender-cvs] [f1c03cc] temp-bge-cleanup: Special cleanup for BL_ModifierDeformer

[Porteries Tristan]

Commit: f1c03cc7d8dcef52b02a1b6a65ee74f80f59457b
Author: Porteries Tristan
Date:   Mon May 4 21:04:11 2015 +0200
Branches: temp-bge-cleanup
https://developer.blender.org/rBf1c03cc7d8dcef52b02a1b6a65ee74f80f59457b

Special cleanup for BL_ModifierDeformer

===================================================================

M	source/gameengine/Converter/BL_ModifierDeformer.cpp
M	source/gameengine/Converter/BL_ModifierDeformer.h

===================================================================

diff --git a/source/gameengine/Converter/BL_ModifierDeformer.cpp b/source/gameengine/Converter/BL_ModifierDeformer.cpp
index d4f891a..5f23ea2 100644
--- a/source/gameengine/Converter/BL_ModifierDeformer.cpp
+++ b/source/gameengine/Converter/BL_ModifierDeformer.cpp
@@ -76,7 +76,7 @@ BL_ModifierDeformer::~BL_ModifierDeformer()
 			m_dm->release(m_dm);
 		}
 	}
-};
+}
 
 RAS_Deformer *BL_ModifierDeformer::GetReplica()
 {
@@ -132,7 +132,7 @@ bool BL_ModifierDeformer::HasArmatureDeformer(Object *ob)
 }
 
 // return a deformed mesh that supports mapping (with a valid CD_ORIGINDEX layer)
-struct DerivedMesh *BL_ModifierDeformer::GetPhysicsMesh(){
+DerivedMesh *BL_ModifierDeformer::GetPhysicsMesh(){
 	/* we need to compute the deformed mesh taking into account the current
 	 * shape and skin deformers, we cannot just call mesh_create_derived_physics()
 	 * because that would use the m_transvers already deformed previously by BL_ModifierDeformer::Update(),
diff --git a/source/gameengine/Converter/BL_ModifierDeformer.h b/source/gameengine/Converter/BL_ModifierDeformer.h
index 6f8e3e5..adbdc22 100644
--- a/source/gameengine/Converter/BL_ModifierDeformer.h
+++ b/source/gameengine/Converter/BL_ModifierDeformer.h
@@ -42,6 +42,7 @@
 
 struct DerivedMesh;
 struct Object;
+struct Scene;
 
 class BL_ModifierDeformer : public BL_ShapeDeformer
 {
@@ -54,8 +55,7 @@ public:
 	                    Scene *scene,
 	                    Object *bmeshobj,
 	                    RAS_MeshObject *mesh)
-		:
-		BL_ShapeDeformer(gameobj, bmeshobj, mesh),
+		: BL_ShapeDeformer(gameobj, bmeshobj, mesh),
 		m_lastModifierUpdate(-1),
 		m_scene(scene),
 		m_dm(NULL)
@@ -65,14 +65,13 @@ public:
 
 	/* this second constructor is needed for making a mesh deformable on the fly. */
 	BL_ModifierDeformer(BL_DeformableGameObject *gameobj,
-	                    struct Scene *scene,
-	                    struct Object *bmeshobj_old,
-	                    struct Object *bmeshobj_new,
-						class RAS_MeshObject *mesh,
+	                    Scene *scene,
+	                    Object *bmeshobj_old,
+	                    Object *bmeshobj_new,
+						RAS_MeshObject *mesh,
 							bool release_object,
 							BL_ArmatureObject *arma = NULL)
-		:
-		BL_ShapeDeformer(gameobj, bmeshobj_old, bmeshobj_new, mesh, release_object, false, arma),
+		: BL_ShapeDeformer(gameobj, bmeshobj_old, bmeshobj_new, mesh, release_object, false, arma),
 		m_lastModifierUpdate(-1),
 		m_scene(scene),
 		m_dm(NULL)
@@ -92,18 +91,19 @@ public:
 	bool Apply(RAS_IPolyMaterial *mat);
 	void ForceUpdate()
 	{
-		m_lastModifierUpdate = -1.0;
+		m_lastModifierUpdate = -1.0f;
 	};
-	virtual struct DerivedMesh *GetFinalMesh(){
+	virtual DerivedMesh *GetFinalMesh()
+	{
 		return m_dm;
 	}
 	// The derived mesh returned by this function must be released!
-	virtual struct DerivedMesh *GetPhysicsMesh();
+	virtual DerivedMesh *GetPhysicsMesh();
 
 protected:
 	double m_lastModifierUpdate;
-	Scene                   *m_scene;
-	DerivedMesh             *m_dm;
+	Scene *m_scene;
+	DerivedMesh *m_dm;
 
 
 #ifdef WITH_CXX_GUARDEDALLOC