1 files changed, 25 insertions, 29 deletions

diff --git a/source/gameengine/Ketsji/KX_Scene.cpp b/source/gameengine/Ketsji/KX_Scene.cpp
index ca4d017fe8c..a460d9bd392 100644
--- a/source/gameengine/Ketsji/KX_Scene.cpp
+++ b/source/gameengine/Ketsji/KX_Scene.cpp
@@ -835,12 +835,6 @@ void KX_Scene::DupliGroupRecurse(CValue* obj, int level)
 		(*git)->Relink(&m_map_gameobject_to_replica);
 		// add the object in the layer of the parent
 		(*git)->SetLayer(groupobj->GetLayer());
-		// If the object was a light, we need to update it's RAS_LightObject as well
-		if ((*git)->GetGameObjectType()==SCA_IObject::OBJ_LIGHT)
-		{
-			KX_LightObject* lightobj = static_cast<KX_LightObject*>(*git);
-			lightobj->SetLayer(groupobj->GetLayer());
-		}
 	}
 
 	// replicate crosslinks etc. between logic bricks
@@ -916,18 +910,20 @@ SCA_IObject* KX_Scene::AddReplicaObject(class CValue* originalobject,
 			replica->GetSGNode()->AddChild(childreplicanode);
 	}
 
-	// At this stage all the objects in the hierarchy have been duplicated,
-	// we can update the scenegraph, we need it for the duplication of logic
-	MT_Point3 newpos = referenceobj->NodeGetWorldPosition();
-	replica->NodeSetLocalPosition(newpos);
+	if (referenceobj) {
+		// At this stage all the objects in the hierarchy have been duplicated,
+		// we can update the scenegraph, we need it for the duplication of logic
+		MT_Point3 newpos = referenceobj->NodeGetWorldPosition();
+		replica->NodeSetLocalPosition(newpos);
+
+		MT_Matrix3x3 newori = referenceobj->NodeGetWorldOrientation();
+		replica->NodeSetLocalOrientation(newori);
 
-	MT_Matrix3x3 newori = referenceobj->NodeGetWorldOrientation();
-	replica->NodeSetLocalOrientation(newori);
-	
-	// get the rootnode's scale
-	MT_Vector3 newscale = referenceobj->GetSGNode()->GetRootSGParent()->GetLocalScale();
-	// set the replica's relative scale with the rootnode's scale
-	replica->NodeSetRelativeScale(newscale);
+		// get the rootnode's scale
+		MT_Vector3 newscale = referenceobj->GetSGNode()->GetRootSGParent()->GetLocalScale();
+		// set the replica's relative scale with the rootnode's scale
+		replica->NodeSetRelativeScale(newscale);
+	}
 
 	replica->GetSGNode()->UpdateWorldData(0);
 	replica->GetSGNode()->SetBBox(originalobj->GetSGNode()->BBox());
@@ -947,13 +943,13 @@ SCA_IObject* KX_Scene::AddReplicaObject(class CValue* originalobject,
 	{
 		// this will also relink the actuators in the hierarchy
 		(*git)->Relink(&m_map_gameobject_to_replica);
-		// add the object in the layer of the reference object
-		(*git)->SetLayer(referenceobj->GetLayer());
-		// If the object was a light, we need to update it's RAS_LightObject as well
-		if ((*git)->GetGameObjectType()==SCA_IObject::OBJ_LIGHT)
-		{
-			KX_LightObject* lightobj = static_cast<KX_LightObject*>(*git);
-			lightobj->SetLayer(referenceobj->GetLayer());
+		if (referenceobj) {
+			// add the object in the layer of the reference object
+			(*git)->SetLayer(referenceobj->GetLayer());
+		}
+		else {
+			// We don't know what layer set, so we set all visible layers in the blender scene.
+			(*git)->SetLayer(m_blenderScene->lay);
 		}
 	}
 
@@ -2503,23 +2499,23 @@ KX_PYMETHODDEF_DOC(KX_Scene, addObject,
 "addObject(object, other, time=0)\n"
 "Returns the added object.\n")
 {
-	PyObject *pyob, *pyreference;
+	PyObject *pyob, *pyreference = Py_None;
 	KX_GameObject *ob, *reference;
 
 	int time = 0;
 
-	if (!PyArg_ParseTuple(args, "OO|i:addObject", &pyob, &pyreference, &time))
+	if (!PyArg_ParseTuple(args, "O|Oi:addObject", &pyob, &pyreference, &time))
 		return NULL;
 
-	if (	!ConvertPythonToGameObject(pyob, &ob, false, "scene.addObject(object, reference, time): KX_Scene (first argument)") ||
-			!ConvertPythonToGameObject(pyreference, &reference, false, "scene.addObject(object, reference, time): KX_Scene (second argument)") )
+	if (!ConvertPythonToGameObject(pyob, &ob, false, "scene.addObject(object, reference, time): KX_Scene (first argument)") ||
+		!ConvertPythonToGameObject(pyreference, &reference, true, "scene.addObject(object, reference, time): KX_Scene (second argument)"))
 		return NULL;
 
 	if (!m_inactivelist->SearchValue(ob)) {
 		PyErr_Format(PyExc_ValueError, "scene.addObject(object, reference, time): KX_Scene (first argument): object must be in an inactive layer");
 		return NULL;
 	}
-	SCA_IObject* replica = AddReplicaObject((SCA_IObject*)ob, reference, time);
+	SCA_IObject *replica = AddReplicaObject((SCA_IObject*)ob, reference, time);
 	
 	// release here because AddReplicaObject AddRef's
 	// the object is added to the scene so we don't want python to own a reference