reverting previous commit from Mitchell. His commit went to the trunk instead of the branch :)

svn merge -r 29067:29066 https://svn.blender.org/svnroot/bf-blender/trunk/blender

5 files changed, 3 insertions, 20 deletions

diff --git a/source/gameengine/Ketsji/CMakeLists.txt b/source/gameengine/Ketsji/CMakeLists.txt
index 1d41a7bcddb..c4af701f87b 100644
--- a/source/gameengine/Ketsji/CMakeLists.txt
+++ b/source/gameengine/Ketsji/CMakeLists.txt
@@ -69,10 +69,6 @@ ELSE(WITH_SDL)
 	ADD_DEFINITIONS(-DDISABLE_SDL)
 ENDIF(WITH_SDL)
 
-if(WITH_DDS)
-	ADD_DEFINITIONS(-DWITH_DDS)
-ENDIF(WITH_DDS)
-
 IF(WITH_PYTHON)
 	SET(INC ${INC} ${PYTHON_INC})
 ELSE(WITH_PYTHON)
diff --git a/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h b/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
index 850bf4b4ad4..879bcd472c6 100644
--- a/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
+++ b/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
@@ -53,8 +53,7 @@ typedef enum {
 	KX_BOUNDCONE,
 	KX_BOUNDMESH,
 	KX_BOUNDPOLYTOPE,
-	KX_BOUND_DYN_MESH,
-	KX_BOUNDCAPSULE
+	KX_BOUND_DYN_MESH
 } KX_BoundBoxClass;
 
 struct KX_BoxBounds
diff --git a/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp b/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
index e793f9d5966..44ae032179b 100644
--- a/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
+++ b/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
@@ -184,14 +184,6 @@ void	KX_ConvertBulletObject(	class	KX_GameObject* gameobj,
 			bm = shapeInfo->CreateBulletShape(ci.m_margin);
 			break;
 		}
-	case KX_BOUNDCAPSULE:
-		{
-			shapeInfo->m_radius = objprop->m_boundobject.c.m_radius;
-			shapeInfo->m_height = objprop->m_boundobject.c.m_height;
-			shapeInfo->m_shapeType = PHY_SHAPE_CAPSULE;
-			bm = shapeInfo->CreateBulletShape(ci.m_margin);
-			break;
-		}
 	case KX_BOUNDMESH:
 		{
 			// mesh shapes can be shared, check first if we already have a shape on that mesh
diff --git a/source/gameengine/Ketsji/KX_PythonInit.cpp b/source/gameengine/Ketsji/KX_PythonInit.cpp
index 7b0283a2efd..0198555753e 100644
--- a/source/gameengine/Ketsji/KX_PythonInit.cpp
+++ b/source/gameengine/Ketsji/KX_PythonInit.cpp
@@ -628,13 +628,12 @@ static PyObject *gLibLoad(PyObject*, PyObject* args)
 	KX_Scene *kx_scene= gp_KetsjiScene;
 	char *path;
 	char *group;
-	char *filter= "";
 	char *err_str= NULL;
 	
-	if (!PyArg_ParseTuple(args,"ss|s:LibLoad",&path, &group, &filter))
+	if (!PyArg_ParseTuple(args,"ss:LibLoad",&path, &group))
 		return NULL;
 
-	if(kx_scene->GetSceneConverter()->LinkBlendFile(path, group, filter, kx_scene, &err_str)) {
+	if(kx_scene->GetSceneConverter()->LinkBlendFile(path, group, kx_scene, &err_str)) {
 		Py_RETURN_TRUE;
 	}
 	
diff --git a/source/gameengine/Ketsji/SConscript b/source/gameengine/Ketsji/SConscript
index 505d3fa10a0..58dc8a314bf 100644
--- a/source/gameengine/Ketsji/SConscript
+++ b/source/gameengine/Ketsji/SConscript
@@ -23,9 +23,6 @@ incs += ' #source/blender/misc #source/blender/blenloader #extern/glew/include #
 incs += ' ' + env['BF_BULLET_INC']
 incs += ' ' + env['BF_OPENGL_INC']
 
-if env['WITH_BF_DDS']:
-	defs.append('WITH_DDS')
-
 if  env['WITH_BF_SDL']:
     incs += ' ' + env['BF_SDL_INC']
 else: