summaryrefslogtreecommitdiff
path: root/src/GLView.h
diff options
context:
space:
mode:
authorDon Bright <hugh.m.bright@gmail.com>2011-12-01 00:46:46 (GMT)
committerDon Bright <hugh.m.bright@gmail.com>2011-12-01 00:46:46 (GMT)
commit8e85f09b29ff8c56c26fa69e369080f1d7e09203 (patch)
treef1645b2af10067f316039b720033bef141a80ad6 /src/GLView.h
parentbcc6120f9b7ce4187c56e0f83dd021674ccdec80 (diff)
parent24d7edd8cab9cf359ccd89bf88bf7a55e2cfc21b (diff)
Merge remote branch 'upstream/master' into cakebaby
Diffstat (limited to 'src/GLView.h')
-rw-r--r--src/GLView.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/GLView.h b/src/GLView.h
index 3a36a15..c31e7af 100644
--- a/src/GLView.h
+++ b/src/GLView.h
@@ -79,8 +79,10 @@ private:
void normalizeAngle(GLdouble& angle);
#ifdef ENABLE_OPENCSG
+ bool is_opencsg_capable;
+ bool has_shaders;
private slots:
- void display_opengl20_warning();
+ void display_opencsg_warning();
#endif
signals:
contact: Jan Huwald // Impressum