diff options
| author | don bright <hugh.m.bright@gmail.com> | 2011-12-09 16:49:55 (GMT) |
|---|---|---|
| committer | don bright <hugh.m.bright@gmail.com> | 2011-12-09 16:49:55 (GMT) |
| commit | a4a64e7c26a0eb523f5b271c9d90f091e5933ebb (patch) | |
| tree | 6e247c3f46c23a6c85b4740a2ff99abaa25fe9bd /src/GLView.h | |
| parent | 51f24b998ba555d15f924ccd4fb5b46219f6537b (diff) | |
| parent | f577f91d25071f5ad1a9fdb6ed7c6dd3aa4c1008 (diff) | |
Merge remote-tracking branch 'upstream/master' into cakebaby
Diffstat (limited to 'src/GLView.h')
| -rw-r--r-- | src/GLView.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/GLView.h b/src/GLView.h index c31e7af..5552e4b 100644 --- a/src/GLView.h +++ b/src/GLView.h @@ -32,7 +32,8 @@ public: void setShowCrosshairs(bool enabled) { this->showcrosshairs = enabled; } bool orthoMode() const { return this->orthomode; } void setOrthoMode(bool enabled) { this->orthomode = enabled; } - + const QString &getRendererInfo() const { return this->rendererInfo; } + public: QLabel *statusLabel; double object_rot_x; @@ -52,6 +53,8 @@ private: void init(); Renderer *renderer; + QString rendererInfo; + bool showfaces; bool showedges; bool showaxes; |