Changeset 649 for branches/vendor/nokia/qt/current/demos/boxes/scene.cpp

Timestamp:

Mar 7, 2010, 11:52:24 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

vendor: Merged in qt-everywhere-opensource-src-4.6.2 from Nokia.

File:

• branches/vendor/nokia/qt/current/demos/boxes/scene.cpp (modified) (3 diffs)

branches/vendor/nokia/qt/current/demos/boxes/scene.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -654 +654 @@
 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)
@@ -663 +664 @@
 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)