synched with trunk at revision 30243
[blender.git] / source / gameengine / Ketsji / KX_Scene.cpp
index c7398e8..950b1ea 100644 (file)
@@ -1772,7 +1772,7 @@ bool KX_Scene::MergeScene(KX_Scene *other)
        }
 
 
-       GetBucketManager()->MergeBucketManager(other->GetBucketManager());
+       GetBucketManager()->MergeBucketManager(other->GetBucketManager(), this);
 
        /* move materials across, assume they both use the same scene-converters */
        GetSceneConverter()->MergeScene(this, other);