solve merge conflict with develop

modules/base/rendering/planetgeometry.cpp

@@ -54,7 +54,7 @@ PlanetGeometry* PlanetGeometry::createFromDictionary(const ghoul::Dictionary& di
 }
 
 PlanetGeometry::PlanetGeometry()
-    : _parent(nullptr)
+    //: _parent(nullptr)
 {
     setName("PlanetGeometry");
 }
@@ -63,7 +63,7 @@ PlanetGeometry::~PlanetGeometry()
 {
 }
 
-bool PlanetGeometry::initialize(RenderablePlanet* parent)
+bool PlanetGeometry::initialize(Renderable* parent)
 {
     _parent = parent;
     return true;

modules/base/rendering/planetgeometry.h

@@ -39,12 +39,12 @@ public:
 
     PlanetGeometry();
     virtual ~PlanetGeometry();
-    virtual bool initialize(RenderablePlanet* parent);
+    virtual bool initialize(Renderable* parent);
     virtual void deinitialize();
     virtual void render() = 0;
 
 protected:
-    RenderablePlanet* _parent;
+    Renderable* _parent;
 };
 
 }  // namespace planetgeometry

modules/base/rendering/renderableplane.cpp

@@ -259,12 +259,12 @@ void RenderablePlane::createPlane() {
     const GLfloat w = _size.value()[1];
     const GLfloat vertex_data[] = { // square of two triangles (sigh)
         //      x      y     z     w     s     t
-        -size, -size, 0.0f, w, 0, 1,
-        size, size, 0.0f, w, 1, 0,
-        -size, size, 0.0f, w, 0, 0,
-        -size, -size, 0.0f, w, 0, 1,
-        size, -size, 0.0f, w, 1, 1,
-        size, size, 0.0f, w, 1, 0,
+        -size, -size, 0.f, w, 0.f, 0.f,
+        size, size, 0.f, w, 1.f, 1.f,
+        -size, size, 0.f, w, 0.f, 1.f,
+        -size, -size, 0.f, w, 0.f, 0.f,
+        size, -size, 0.f, w, 1.f, 0.f,
+        size, size, 0.f, w, 1.f, 1.f,
     };
 
     glBindVertexArray(_quad); // bind array

modules/base/rendering/simplespheregeometry.cpp

@@ -91,7 +91,7 @@ SimpleSphereGeometry::~SimpleSphereGeometry()
 {
 }
 
-bool SimpleSphereGeometry::initialize(RenderablePlanet* parent)
+bool SimpleSphereGeometry::initialize(Renderable* parent)
 {
     bool success = PlanetGeometry::initialize(parent);
     createSphere();

modules/base/rendering/simplespheregeometry.h

@@ -31,7 +31,7 @@
 
 namespace openspace {
 
-class RenderablePlanet;
+class Renderable;
 class PowerScaledSphere;
 
 namespace planetgeometry {
@@ -42,7 +42,7 @@ public:
     ~SimpleSphereGeometry();
 
 
-    bool initialize(RenderablePlanet* parent) override;
+    bool initialize(Renderable* parent) override;
     void deinitialize() override;
     void render() override;
     PowerScaledSphere* _planet;