From ac1bd39cfea2aaa2fe44467f827371025daed11d Mon Sep 17 00:00:00 2001 From: wmayer Date: Wed, 8 Mar 2017 23:07:51 +0100 Subject: [PATCH] disabling depth test makes 3d viewer work again --- src/Gui/Quarter/QuarterWidget.cpp | 4 ++++ src/QtOpenGL.h.cmake | 1 + 2 files changed, 5 insertions(+) diff --git a/src/Gui/Quarter/QuarterWidget.cpp b/src/Gui/Quarter/QuarterWidget.cpp index baff18fa54..e121b6a73f 100644 --- a/src/Gui/Quarter/QuarterWidget.cpp +++ b/src/Gui/Quarter/QuarterWidget.cpp @@ -763,14 +763,18 @@ void QuarterWidget::paintEvent(QPaintEvent* event) std::clock_t begin = std::clock(); if(!initialized) { +#if !defined(HAVE_QT5_OPENGL) glEnable(GL_DEPTH_TEST); +#endif this->getSoRenderManager()->reinitialize(); initialized = true; } getSoRenderManager()->activate(); +#if !defined(HAVE_QT5_OPENGL) glEnable(GL_DEPTH_TEST); +#endif glMatrixMode(GL_PROJECTION); QtGLWidget* w = static_cast(this->viewport()); diff --git a/src/QtOpenGL.h.cmake b/src/QtOpenGL.h.cmake index 847deb2bcf..04b639dc7b 100644 --- a/src/QtOpenGL.h.cmake +++ b/src/QtOpenGL.h.cmake @@ -35,6 +35,7 @@ #include #include #include +#include typedef QOpenGLContext QtGLContext; typedef QSurfaceFormat QtGLFormat;