From caf952c2521213a7f20e10e7cf6bd654a34c2aa7 Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Sun, 4 Nov 2018 14:36:59 -0800 Subject: [PATCH] Fix duplicated window member --- libraries/gl/src/gl/Context.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libraries/gl/src/gl/Context.h b/libraries/gl/src/gl/Context.h index 05cb361725..1040868c78 100644 --- a/libraries/gl/src/gl/Context.h +++ b/libraries/gl/src/gl/Context.h @@ -56,6 +56,7 @@ namespace gl { void release(); virtual ~Context(); + QWindow* getWindow() const { return _window; } void clear(); void setWindow(QWindow* window); bool makeCurrent(); @@ -80,8 +81,6 @@ namespace gl { class OffscreenContext : public Context { using Parent = Context; - protected: - QWindow* _window { nullptr }; public: virtual ~OffscreenContext(); void create(QOpenGLContext* shareContext = nullptr) override;