[Bf-blender-cvs] [81e28b8] master: BGE Cleanup: Removing the empty KX_ClearBulletSharedShapes() function

Mitchell Stokes noreply at git.blender.org
Wed Apr 23 23:16:52 CEST 2014


Commit: 81e28b8802a65a3efd6410e75a3fb92a21ed69a3
Author: Mitchell Stokes
Date:   Wed Apr 23 13:59:04 2014 -0700
https://developer.blender.org/rB81e28b8802a65a3efd6410e75a3fb92a21ed69a3

BGE Cleanup: Removing the empty KX_ClearBulletSharedShapes() function

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

M	source/gameengine/Converter/KX_BlenderSceneConverter.cpp
M	source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
M	source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp

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

diff --git a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
index 854e9fe..6b7a53c 100644
--- a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
+++ b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
@@ -190,9 +190,6 @@ KX_BlenderSceneConverter::~KX_BlenderSceneConverter()
 	}
 	m_meshobjects.clear();
 
-#ifdef WITH_BULLET
-	KX_ClearBulletSharedShapes();
-#endif
 
 	/* free any data that was dynamically loaded */
 	while (m_DynamicMaggie.size() != 0)
diff --git a/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h b/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
index 5e2556b..4f341d7 100644
--- a/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
+++ b/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
@@ -47,8 +47,7 @@ void	KX_ConvertBulletObject(class	KX_GameObject* gameobj,
 	int activeLayerBitInfo,
 	bool isCompoundChild,
 	bool hasCompoundChildren);
-	
-void	KX_ClearBulletSharedShapes();
+
 bool KX_ReInstanceBulletShapeFromMesh(KX_GameObject *gameobj, KX_GameObject *from_gameobj, RAS_MeshObject* from_meshobj);
 
 #endif
diff --git a/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp b/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
index f1a52e1..5791c9f 100644
--- a/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
+++ b/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
@@ -567,11 +567,6 @@ void	KX_ConvertBulletObject(	class	KX_GameObject* gameobj,
 
 }
 
-
-void	KX_ClearBulletSharedShapes()
-{
-}
-
 /* Refresh the physics object from either an object or a mesh.
  * gameobj must be valid
  * from_gameobj and from_meshobj can be NULL




More information about the Bf-blender-cvs mailing list