X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FMoof%2FCamera.cc;h=6b6cfa1ac8572a26f6d8a558177813d9a342e434;hb=d5b4262bc0c6cea41c603e8a3a85ab93adfdc36b;hp=06261a1b41ba811b75a7746da669d6e5f6768531;hpb=8ad81a8282ce6e9e488a453e6bcd05fbc09715dc;p=chaz%2Fyoink

diff --git a/src/Moof/Camera.cc b/src/Moof/Camera.cc
index 06261a1..6b6cfa1 100644
--- a/src/Moof/Camera.cc
+++ b/src/Moof/Camera.cc
@@ -60,12 +60,13 @@ void Camera::setProjection(Scalar fovy, Scalar aspect, Scalar abutting,
 }
 
 
-void Camera::uploadProjectionToGL() const
+void Camera::uploadToGL() const
 {
 	glMatrixMode(GL_PROJECTION);
-	glLoadMatrix(projection_.data());
+	glMultMatrix(projection_.data());
 
 	glMatrixMode(GL_MODELVIEW);
+	glMultMatrix(modelview_.data());
 }
 
 void Camera::update(Scalar t, Scalar dt)