Merge remote-tracking branch 'origin/master' into feature/openglstatecache

# Conflicts:
#	ext/ghoul
#	modules/digitaluniverse/rendering/renderablebillboardscloud.cpp
#	modules/digitaluniverse/rendering/renderableplanescloud.cpp
#	src/util/screenlog.cpp

include/openspace/rendering/renderable.h

@@ -36,7 +36,7 @@ namespace ghoul { class Dictionary; }
 namespace ghoul::opengl {
     class ProgramObject;
     class Texture;
-}
+} // namespace ghoul::opengl
 
 namespace openspace {
 
@@ -72,6 +72,7 @@ public:
 
     virtual bool isReady() const = 0;
     bool isEnabled() const;
+    bool shouldUpdateIfDisabled() const;
 
     void setBoundingSphere(float boundingSphere);
     float boundingSphere() const;
@@ -99,6 +100,8 @@ protected:
     properties::FloatProperty _boundingSphere;
     properties::StringProperty _renderableType;
 
+    bool _shouldUpdateIfDisabled = false;
+
     void setRenderBinFromOpacity();
     void registerUpdateRenderBinFromOpacity();
 

include/openspace/rendering/renderengine.h

@@ -250,6 +250,8 @@ private:
         glm::ivec4 zoom = glm::ivec4(0);
         glm::ivec4 roll = glm::ivec4(0);
     } _cameraButtonLocations;
+
+    std::string _versionString;
 };
 
 } // namespace openspace