aboutsummaryrefslogtreecommitdiffstats
path: root/src/menu
diff options
context:
space:
mode:
Diffstat (limited to 'src/menu')
-rw-r--r--src/menu/container.cpp6
-rw-r--r--src/menu/drawable_control.cpp2
2 files changed, 6 insertions, 2 deletions
diff --git a/src/menu/container.cpp b/src/menu/container.cpp
index 3cf8d770..bf742dff 100644
--- a/src/menu/container.cpp
+++ b/src/menu/container.cpp
@@ -24,6 +24,8 @@
* $Id$
*/
+#include <GL/gl.h>
+
#include "container.hpp"
#include "frame.hpp"
@@ -60,9 +62,13 @@ namespace usdx
frame->repaint();
}
+ GLfloat matrix[16];
+ glGetFloatv(GL_MODELVIEW_MATRIX, matrix);
+
for (std::list<DrawableControl*>::iterator it =
controls.begin(); it != controls.end(); it++) {
(*it)->repaint();
+ glLoadMatrixf(matrix);
}
}
diff --git a/src/menu/drawable_control.cpp b/src/menu/drawable_control.cpp
index 10da2bfc..4d1f8355 100644
--- a/src/menu/drawable_control.cpp
+++ b/src/menu/drawable_control.cpp
@@ -68,8 +68,6 @@ namespace usdx
void DrawableControl::repaint(void)
{
- glLoadIdentity();
-
{
// position
boost::mutex::scoped_lock lock(position_mutex);