Merge branch 'develop' into feature/milkyway

include/openspace/rendering/planets/renderableplanet.h

@@ -65,6 +65,7 @@ private:
     ghoul::opengl::ProgramObject* _programObject;
     ghoul::opengl::Texture* _texture;
     planetgeometry::PlanetGeometry* _geometry;
+    properties::BoolProperty _performShading;
 
 	glm::dmat3 _stateMatrix;
 

include/openspace/rendering/renderableplane.h

@@ -65,6 +65,7 @@ private:
 	Origin _origin;
 
 	ghoul::opengl::ProgramObject* _shader;
+    bool _programIsDirty;
 	ghoul::opengl::Texture* _texture;
 	GLuint _quad;
 	GLuint _vertexPositionBuffer;

include/openspace/rendering/renderabletrail.h

@@ -29,6 +29,8 @@
 #include <openspace/properties/stringproperty.h>
 #include <openspace/properties/vectorproperty.h>
 
+#include <ghoul/opengl/ghoul_gl.h>
+
 namespace ghoul {
 namespace opengl {
     class ProgramObject;