diff options
| author | Martin Smith <msmith@trolltech.com> | 2010-01-08 11:50:06 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2010-01-08 11:50:06 (GMT) |
| commit | 2530a32d5e02f2cde0cdf3d6d4e42a0079d669fd (patch) | |
| tree | 479a98d12ffb6df51965c8355f4f0dae4226c38b /demos | |
| parent | 3aa77d64608f944592939c5d673f1b7dabec730f (diff) | |
| parent | 4ba439f78aec1caef268dba0f229b8a0242e4c8d (diff) | |
| download | Qt-2530a32d5e02f2cde0cdf3d6d4e42a0079d669fd.zip Qt-2530a32d5e02f2cde0cdf3d6d4e42a0079d669fd.tar.gz Qt-2530a32d5e02f2cde0cdf3d6d4e42a0079d669fd.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/boxes/scene.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/demos/boxes/scene.cpp b/demos/boxes/scene.cpp index b6b4500..97953f2 100644 --- a/demos/boxes/scene.cpp +++ b/demos/boxes/scene.cpp @@ -653,7 +653,8 @@ void Scene::initGL() static void loadMatrix(const QMatrix4x4& m) { - GLfloat mat[16]; + // static to prevent glLoadMatrixf to fail on certain drivers + static GLfloat mat[16]; const qreal *data = m.constData(); for (int index = 0; index < 16; ++index) mat[index] = data[index]; @@ -662,7 +663,8 @@ static void loadMatrix(const QMatrix4x4& m) static void multMatrix(const QMatrix4x4& m) { - GLfloat mat[16]; + // static to prevent glMultMatrixf to fail on certain drivers + static GLfloat mat[16]; const qreal *data = m.constData(); for (int index = 0; index < 16; ++index) mat[index] = data[index]; |