From e357f24e703a800f4f7f695b3894a48ef22390a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Sun, 29 Jan 2012 00:49:19 +0100
Subject: [PATCH] Scene::viewportWidth/viewportHeight were never set, got rid
 of them.

Caused setting viewport size to some random and possibly dangerous value
after assigning camera to the scene.
---
 src/Scene.cpp | 2 +-
 src/Scene.h   | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/Scene.cpp b/src/Scene.cpp
index ff5fa27db..63cbfa495 100644
--- a/src/Scene.cpp
+++ b/src/Scene.cpp
@@ -54,7 +54,7 @@ void Scene::setCamera(Camera* camera) {
     /* Set new camera active */
     _camera = camera;
     if(_camera) {
-        _camera->setViewport(viewportWidth, viewportHeight);
+        if(oldCamera) _camera->setViewport(oldCamera->viewport());
         _camera->setActive(this);
     }
 
diff --git a/src/Scene.h b/src/Scene.h
index 28326f224..f4705d731 100644
--- a/src/Scene.h
+++ b/src/Scene.h
@@ -98,8 +98,6 @@ class Scene: public Object {
         Camera* _camera;
         GLuint vao;
 
-        unsigned int viewportWidth, viewportHeight;
-
         inline virtual void draw(const Magnum::Matrix4& transformationMatrix, const Magnum::Matrix4& projectionMatrix) {}
         void drawChildren(Object* object, const Matrix4& transformationMatrix);
 };