Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop

Conflicts:
	src/rendering/renderengine.cpp

include/openspace/rendering/planets/renderableplanetprojection.h

@@ -24,6 +24,7 @@
 
 #ifndef __RENDERABLEPLANETPROJECTION_H__
 #define __RENDERABLEPLANETPROJECTION_H__
+
 #include <ghoul/opengl/textureunit.h>
 
 // open space includes

include/openspace/rendering/planets/simplespheregeometryprojection.h

@@ -54,10 +54,6 @@ private:
     properties::IntProperty _segments;
 	std::string _name;
 
-	properties::IntProperty _vaoID;
-	properties::IntProperty _vBufferID;
-	properties::IntProperty _iBufferID;
-
     PowerScaledSphere* _planet;
 };
 

include/openspace/rendering/renderengine.h

@@ -51,7 +51,7 @@ public:
 	RenderEngine();
 	~RenderEngine();
 	
-	bool initialize();
+	bool initialize(const std::string& renderingMethod);
 
     void setSceneGraph(Scene* sceneGraph);
     Scene* scene();
@@ -113,6 +113,7 @@ private:
 	Camera* _mainCamera;
 	Scene* _sceneGraph;
 	ABuffer* _abuffer;
+    int _abufferImplementation;
 	ScreenLog* _log;
 
 	bool _showInfo;