solve merge

include/openspace/rendering/screenspacerenderable.h

@@ -120,7 +120,6 @@ protected:
 	glm::vec2 _originalViewportSize;
 
 	float _radius;
-	bool _toDelete;
 };
 }  // namespace openspace
 #endif  // __SCREENSPACERENDERABLE_H__

modules/base/rendering/screenspaceframebuffer.cpp

@@ -116,10 +116,8 @@ void ScreenSpaceFramebuffer::render(){
 	}
 }
 
-void ScreenSpaceFramebuffer::update(){
-	// if(_toDelete)
-	// 	OsEng.renderEngine().unregisterScreenSpaceRenderable(name());
-}
+
+void ScreenSpaceFramebuffer::update(){}
 
 bool ScreenSpaceFramebuffer::isReady() const{
 	bool ready = true;
@@ -154,7 +152,7 @@ void ScreenSpaceFramebuffer::createFragmentbuffer(){
 }
 
 int ScreenSpaceFramebuffer::id(){
-		static int id = 0;
-		return id++;
+	static int id = 0;
+	return id++;
 }
 } //namespace openspace

modules/base/rendering/screenspaceimage.cpp

@@ -87,10 +87,8 @@ void ScreenSpaceImage::render(){
 	draw(modelTransform);
 }
 
-void ScreenSpaceImage::update(){
-	// if(_toDelete)
-	// 	OsEng.renderEngine().unregisterScreenSpaceRenderable(name());
-}
+
+void ScreenSpaceImage::update(){}
 
 
 bool ScreenSpaceImage::isReady() const{

modules/iswa/rendering/screenspacecygnet.cpp

@@ -112,9 +112,6 @@ void ScreenSpaceCygnet::render(){
 }
 
 void ScreenSpaceCygnet::update(){
-	if(_toDelete)
-		OsEng.renderEngine().unregisterScreenSpaceRenderable(name());
-
 	//if(_path != ""){
 		_time = Time::ref().currentTime();
 		_openSpaceUpdateInterval = abs(Time::ref().deltaTime()*_updateInterval);

src/rendering/screenspacerenderable.cpp

@@ -41,7 +41,6 @@ ScreenSpaceRenderable::ScreenSpaceRenderable()
 	,_fragmentPath("${MODULE_BASE}/shaders/screnspace_fs.glsl")
 	,_texture(nullptr)
 	,_shader(nullptr)
-	,_toDelete(false)
 {
 	addProperty(_enabled);
 	addProperty(_useFlatScreen);