1 files changed, 0 insertions, 86 deletions

diff --git a/source/gameengine/Ketsji/KX_GameObject.cpp b/source/gameengine/Ketsji/KX_GameObject.cpp
index 3cfb670d227..fe8419d5343 100644
--- a/source/gameengine/Ketsji/KX_GameObject.cpp
+++ b/source/gameengine/Ketsji/KX_GameObject.cpp
@@ -109,8 +109,6 @@ KX_GameObject::KX_GameObject(
       m_xray(false),
       m_pHitObject(NULL),
       m_pObstacleSimulation(NULL),
-      m_pInstanceObjects(NULL),
-      m_pDupliGroupObject(NULL),
       m_actionManager(NULL),
       m_isDeformable(false)
 #ifdef WITH_PYTHON
@@ -170,16 +168,6 @@ KX_GameObject::~KX_GameObject()
 		KX_GetActiveScene()->RemoveAnimatedObject(this);
 		delete m_actionManager;
 	}
-
-	if (m_pDupliGroupObject)
-	{
-		m_pDupliGroupObject->Release();
-	}
-
-	if (m_pInstanceObjects)
-	{
-		m_pInstanceObjects->Release();
-	}
 #ifdef WITH_PYTHON
 	if (m_attr_dict) {
 		PyDict_Clear(m_attr_dict); /* in case of circular refs or other weird cases */
@@ -241,46 +229,6 @@ KX_IPhysicsController* KX_GameObject::GetPhysicsController()
 	return m_pPhysicsController1;
 }
 
-KX_GameObject* KX_GameObject::GetDupliGroupObject()
-{ 
-	return m_pDupliGroupObject;	
-}
-
-CListValue* KX_GameObject::GetInstanceObjects()
-{ 
-	return m_pInstanceObjects;
-}
-
-void KX_GameObject::AddInstanceObjects(KX_GameObject* obj)
-{
-	if(!m_pInstanceObjects)
-		m_pInstanceObjects = new CListValue();
-
-	obj->AddRef();
-  	m_pInstanceObjects->Add(obj);
-}
-
-void KX_GameObject::RemoveInstanceObject(KX_GameObject* obj)
-{
-	assert(m_pInstanceObjects);
-	m_pInstanceObjects->RemoveValue(obj);
-	obj->Release();
-}
-
-void KX_GameObject::RemoveDupliGroupObject()
-{
-	if(m_pDupliGroupObject) {
-		m_pDupliGroupObject->Release();
-		m_pDupliGroupObject = NULL;
-	}
-}
-
-void KX_GameObject::SetDupliGroupObject(KX_GameObject* obj)
-{
-	obj->AddRef();
-	m_pDupliGroupObject = obj;
-}
-
 KX_GameObject* KX_GameObject::GetParent()
 {
 	KX_GameObject* result = NULL;
@@ -1681,9 +1629,6 @@ PyMethodDef KX_GameObject::Methods[] = {
 PyAttributeDef KX_GameObject::Attributes[] = {
 	KX_PYATTRIBUTE_RO_FUNCTION("name",		KX_GameObject, pyattr_get_name),
 	KX_PYATTRIBUTE_RO_FUNCTION("parent",	KX_GameObject, pyattr_get_parent),
-	KX_PYATTRIBUTE_RO_FUNCTION("group_children",	KX_GameObject, pyattr_get_group_children),
-	KX_PYATTRIBUTE_RO_FUNCTION("group_parent",		KX_GameObject, pyattr_get_group_parent),
-	KX_PYATTRIBUTE_RO_FUNCTION("scene",		KX_GameObject, pyattr_get_scene),
 	KX_PYATTRIBUTE_RO_FUNCTION("life",		KX_GameObject, pyattr_get_life),
 	KX_PYATTRIBUTE_RW_FUNCTION("mass",		KX_GameObject, pyattr_get_mass,		pyattr_set_mass),
 	KX_PYATTRIBUTE_RW_FUNCTION("linVelocityMin",		KX_GameObject, pyattr_get_lin_vel_min, pyattr_set_lin_vel_min),
@@ -1979,37 +1924,6 @@ PyObject *KX_GameObject::pyattr_get_parent(void *self_v, const KX_PYATTRIBUTE_DE
 	Py_RETURN_NONE;
 }
 
-PyObject *KX_GameObject::pyattr_get_group_children(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
-{
-	KX_GameObject* self= static_cast<KX_GameObject*>(self_v);
-	CListValue* instances = self->GetInstanceObjects();
-	if (instances) {
-		return instances->GetProxy();
-	}
-	Py_RETURN_NONE;
-}
-
-PyObject* KX_GameObject::pyattr_get_scene(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
-{
-	KX_GameObject *self = static_cast<KX_GameObject*>(self_v);
-	SG_Node *node = self->GetSGNode();
-	KX_Scene *scene = static_cast<KX_Scene *>(node->GetSGClientInfo());
-	if (scene) {
-		return scene->GetProxy();
-	}
-	Py_RETURN_NONE;
-}
-
-PyObject *KX_GameObject::pyattr_get_group_parent(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
-{
-	KX_GameObject* self= static_cast<KX_GameObject*>(self_v);
-	KX_GameObject* pivot = self->GetDupliGroupObject();
-	if (pivot) {
-		return pivot->GetProxy();
-	}
-	Py_RETURN_NONE;
-}
-
 PyObject *KX_GameObject::pyattr_get_life(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
 	KX_GameObject* self= static_cast<KX_GameObject*>(self_v);