Merged master in

This commit is contained in:
GPayne
2021-07-19 22:41:25 -06:00
18 changed files with 107 additions and 64 deletions

View File

@@ -194,7 +194,7 @@ private:
ghoul::Dictionary _resolveData;
ScreenLog* _log = nullptr;
ghoul::opengl::OpenGLStateCache* _openglStateCache;
ghoul::opengl::OpenGLStateCache* _openglStateCache = nullptr;
properties::BoolProperty _showOverlayOnSlaves;
properties::BoolProperty _showLog;