Fix for bug #3858: the game engine mouse focus sensor did not work

correct if there was more than one camera. It shoots rays from the
active camera, but used the viewport from whichever camera was drawn
last, now it uses the correct vieport.

1 files changed, 3 insertions, 3 deletions

diff --git a/source/gameengine/Ketsji/KX_KetsjiEngine.cpp b/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
index 888dcf3d01f..c7b0d7b3ea3 100644
--- a/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
+++ b/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
@@ -299,7 +299,7 @@ void KX_KetsjiEngine::ClearFrame()
 		list<KX_Camera*>::iterator it;
 		for(it = cameras->begin(); it != cameras->end(); it++)
 		{
-			SetupViewport(scene, (*it), area, viewport);
+			GetSceneViewport(scene, (*it), area, viewport);
 
 			if(!doclear) {
 				clearvp = viewport;
@@ -894,7 +894,7 @@ void KX_KetsjiEngine::SetCameraOverrideClipping(float near, float far)
 	m_overrideCamFar = far;
 }
 
-void KX_KetsjiEngine::SetupViewport(KX_Scene *scene, KX_Camera* cam, RAS_Rect& area, RAS_Rect& viewport)
+void KX_KetsjiEngine::GetSceneViewport(KX_Scene *scene, KX_Camera* cam, RAS_Rect& area, RAS_Rect& viewport)
 {
 	// In this function we make sure the rasterizer settings are upto
 	// date. We compute the viewport so that logic
@@ -1001,7 +1001,7 @@ void KX_KetsjiEngine::RenderFrame(KX_Scene* scene, KX_Camera* cam)
 	if (!cam)
 		return;
 
-	SetupViewport(scene, cam, area, viewport);
+	GetSceneViewport(scene, cam, area, viewport);
 
 	// store the computed viewport in the scene
 	scene->SetSceneViewport(viewport);