BGE: When dynamically loading scenes (bge.logic.LibLoad()) in GLSL mode, the lights in the loaded scene would not affect the current scene and vice versa. To fix this, I've updated to merge code to update the scenes that the shaders are using to the scene being merged into.

source/gameengine/Ketsji/BL_BlenderShader.h

@@ -56,6 +56,13 @@ public:
 	void ReloadMaterial();
 	int GetBlendMode();
 
+	void SetScene(KX_Scene *scene)
+	{
+		mScene = scene;
+		mBlenderScene = scene->GetBlenderScene();
+		ReloadMaterial();
+	}
+
 	bool Equals(BL_BlenderShader *blshader);
 	
 	

source/gameengine/Ketsji/KX_BlenderMaterial.h

@@ -89,6 +89,7 @@ public:
 	virtual void Replace_IScene(SCA_IScene *val)
 	{
 		mScene= static_cast<KX_Scene *>(val);
+		mBlenderShader->SetScene(mScene);
 	};
 
 #ifndef DISABLE_PYTHON

source/gameengine/Ketsji/KX_Scene.cpp

@@ -1754,7 +1754,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);

source/gameengine/Rasterizer/RAS_BucketManager.cpp

@@ -346,13 +346,21 @@ void RAS_BucketManager::RemoveMaterial(RAS_IPolyMaterial * mat)
 
 //#include <stdio.h>
 
-void RAS_BucketManager::MergeBucketManager(RAS_BucketManager *other)
+void RAS_BucketManager::MergeBucketManager(RAS_BucketManager *other, SCA_IScene *scene)
 {
 	/* concatinate lists */
 	// printf("BEFORE %d %d\n", GetSolidBuckets().size(), GetAlphaBuckets().size());
+	BucketList::iterator it;
+
+	for (it = other->GetSolidBuckets().begin(); it != other->GetSolidBuckets().end(); ++it)
+		(*it)->GetPolyMaterial()->Replace_IScene(scene);
+
 	GetSolidBuckets().insert( GetSolidBuckets().end(), other->GetSolidBuckets().begin(), other->GetSolidBuckets().end() );
 	other->GetSolidBuckets().clear();
 
+	for (it = other->GetAlphaBuckets().begin(); it != other->GetAlphaBuckets().end(); ++it)
+		(*it)->GetPolyMaterial()->Replace_IScene(scene);
+
 	GetAlphaBuckets().insert( GetAlphaBuckets().end(), other->GetAlphaBuckets().begin(), other->GetAlphaBuckets().end() );
 	other->GetAlphaBuckets().clear();
 	//printf("AFTER %d %d\n", GetSolidBuckets().size(), GetAlphaBuckets().size());

source/gameengine/Rasterizer/RAS_BucketManager.h

@@ -63,7 +63,7 @@ public:
 	void RemoveMaterial(RAS_IPolyMaterial * mat); // freeing scenes only
 
 	/* for merging */
-	void MergeBucketManager(RAS_BucketManager *other);
+	void MergeBucketManager(RAS_BucketManager *other, SCA_IScene *scene);
 	BucketList & GetSolidBuckets() {return m_SolidBuckets;};
 	BucketList & GetAlphaBuckets() {return m_AlphaBuckets;};