From ac588a428eac4e6313e64a7c11564ca444d814a7 Mon Sep 17 00:00:00 2001
From: Marco Biasini <marco.biasini@unibas.ch>
Date: Fri, 22 Oct 2010 13:22:51 +0200
Subject: [PATCH] initialise try_stereo to false
Fixes issues with stereo initialisation code
---
modules/gui/src/gl_win.cc | 4 +++-
modules/gui/src/gosty_app.cc | 3 ++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/modules/gui/src/gl_win.cc b/modules/gui/src/gl_win.cc
index ed609e1c9..6e2fbdf2f 100644
--- a/modules/gui/src/gl_win.cc
+++ b/modules/gui/src/gl_win.cc
@@ -56,7 +56,9 @@ gl_canvas_(NULL)
LOG_VERBOSE("GLCanvas: trying stereo visuals first");
for(int format_id=3;format_id>=0;--format_id) {
QGLFormat format=GLWin::CreateFormat(format_id);
- format.setStereo(true);
+ if (try_stereo) {
+ format.setStereo(true);
+ }
gl_canvas_=new GLCanvas(this, main, format);
if(gl_canvas_->isValid() && gl_canvas_->format().stereo()) {
break; // format is fine
diff --git a/modules/gui/src/gosty_app.cc b/modules/gui/src/gosty_app.cc
index 663c4f4e3..0253e11aa 100644
--- a/modules/gui/src/gosty_app.cc
+++ b/modules/gui/src/gosty_app.cc
@@ -45,7 +45,8 @@ GostyApp* GostyApp::app_=NULL;
GostyApp::GostyApp():
py_shell_(NULL), gl_win_(NULL), scene_win_(NULL), message_widget_(NULL), seq_viewer_(NULL),
tool_options_win_(NULL), main_(new GostyMainWindow),
- perspective_(NULL), external_widgets_(QMap<QString,WidgetGeomHandler *>())
+ perspective_(NULL), external_widgets_(QMap<QString,WidgetGeomHandler *>()),
+ try_stereo_(false)
{
assert(GostyApp::app_==NULL);
GostyApp::app_=this;
--
GitLab