From 9891c9494797cb87f93dd50a430d604fee1af5df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= Date: Mon, 20 May 2013 08:37:20 +0300 Subject: Mac fix Different initialization order not needed anymore. Causes crash if used. Change-Id: I5c58f57c5352ea0e18719d6b569b22385e62be50 Change-Id: I5c58f57c5352ea0e18719d6b569b22385e62be50 Reviewed-by: Miikka Heikkinen --- src/datavis3d/engine/q3dwindow.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/datavis3d/engine/q3dwindow.cpp b/src/datavis3d/engine/q3dwindow.cpp index a172e7b6..2db3d964 100644 --- a/src/datavis3d/engine/q3dwindow.cpp +++ b/src/datavis3d/engine/q3dwindow.cpp @@ -68,11 +68,9 @@ Q3DWindow::Q3DWindow(QWindow *parent) d_ptr->m_context->setFormat(requestedFormat()); d_ptr->m_context->create(); -#if !defined(Q_OS_MAC) - // These are required here for windows (and linux?), but cause errors on mac d_ptr->m_context->makeCurrent(this); initializeOpenGLFunctions(); -#endif + initialize(); } @@ -131,9 +129,6 @@ void Q3DWindow::renderNow() d_ptr->m_context->makeCurrent(this); if (needsInit) { -#if defined(Q_OS_MAC) - initializeOpenGLFunctions(); -#endif initialize(); needsInit = false; } -- cgit v1.2.3