diff --git a/include/openspace/rendering/planets/renderableplanetprojection.h b/include/openspace/rendering/planets/renderableplanetprojection.h index a585aa5b0d..174fb75c16 100644 --- a/include/openspace/rendering/planets/renderableplanetprojection.h +++ b/include/openspace/rendering/planets/renderableplanetprojection.h @@ -24,6 +24,7 @@ #ifndef __RENDERABLEPLANETPROJECTION_H__ #define __RENDERABLEPLANETPROJECTION_H__ + #include // open space includes diff --git a/shaders/ABuffer/abufferSort.hglsl b/shaders/ABuffer/abufferSort.hglsl index 478813a86a..8be2180e0a 100644 --- a/shaders/ABuffer/abufferSort.hglsl +++ b/shaders/ABuffer/abufferSort.hglsl @@ -57,9 +57,9 @@ int build_local_fragments_list() { return int(frag_count); #endif -#if ABUFFER_IMPLEMENTATION == ABUFFER_FRAMEBUFFER +// #if ABUFFER_IMPLEMENTATION == ABUFFER_FRAMEBUFFER return 0; -#endif +// #endif } float pscLength(vec4 v1, vec4 v2) { diff --git a/src/abuffer/abufferfixed.cpp b/src/abuffer/abufferfixed.cpp index 9277f70e3f..37455ac16a 100644 --- a/src/abuffer/abufferfixed.cpp +++ b/src/abuffer/abufferfixed.cpp @@ -45,9 +45,6 @@ ABufferFixed::ABufferFixed(): _data(0), _anchorPointerTexture(0), {} ABufferFixed::~ABufferFixed() { - if(_data != 0) - delete _data; - glDeleteTextures(1,&_anchorPointerTexture); glDeleteTextures(1,&_fragmentTexture); // glDeleteTextures(1,&_atomicCounterTexture); diff --git a/src/rendering/renderableplane.cpp b/src/rendering/renderableplane.cpp index a986c10985..ab144a22ee 100644 --- a/src/rendering/renderableplane.cpp +++ b/src/rendering/renderableplane.cpp @@ -183,9 +183,7 @@ void RenderablePlane::update(const UpdateData& data) { } void RenderablePlane::loadTexture() { - LDEBUG("loadTexture"); if (_texturePath.value() != "") { - LDEBUG("loadTexture2"); ghoul::opengl::Texture* texture = ghoul::io::TextureReader::ref().loadTexture(absPath(_texturePath)); if (texture) { LDEBUG("Loaded texture from '" << absPath(_texturePath) << "'");