diff --git a/ext/ghoul b/ext/ghoul index e39984d41d..49a2ef9adc 160000 --- a/ext/ghoul +++ b/ext/ghoul @@ -1 +1 @@ -Subproject commit e39984d41d6108b9fe38b50202972ac7c6cb7435 +Subproject commit 49a2ef9adcf469019cd0598c742e38be007d379c diff --git a/modules/base/rendering/renderablestars.cpp b/modules/base/rendering/renderablestars.cpp index 7a676d9b10..da562905eb 100644 --- a/modules/base/rendering/renderablestars.cpp +++ b/modules/base/rendering/renderablestars.cpp @@ -150,6 +150,7 @@ bool RenderableStars::initialize() { "${MODULE_BASE}/shaders/star_vs.glsl", "${MODULE_BASE}/shaders/star_fs.glsl", "${MODULE_BASE}/shaders/star_ge.glsl"); + if (!_program) return false; completeSuccess &= loadData(); diff --git a/shaders/PowerScaling/powerScalingMath.hglsl b/shaders/PowerScaling/powerScalingMath.hglsl index 583ff34f36..0e2e9e1a5e 100644 --- a/shaders/PowerScaling/powerScalingMath.hglsl +++ b/shaders/PowerScaling/powerScalingMath.hglsl @@ -65,4 +65,4 @@ vec4 z_normalization(vec4 v_in) { return v_out; } -#endif \ No newline at end of file +#endif diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp index 80db9dceb8..c6685206e8 100644 --- a/src/engine/openspaceengine.cpp +++ b/src/engine/openspaceengine.cpp @@ -272,7 +272,7 @@ bool OpenSpaceEngine::create( _engine->_console->initialize(); // Register the provided shader directories - ghoul::opengl::ShaderPreprocessor::addIncludePath("${SHADERS}"); + ghoul::opengl::ShaderPreprocessor::addIncludePath(absPath("${SHADERS}")); _engine->_syncBuffer = new SyncBuffer(1024); diff --git a/src/rendering/renderengine.cpp b/src/rendering/renderengine.cpp index f5b66df4e9..3cdd9e5971 100644 --- a/src/rendering/renderengine.cpp +++ b/src/rendering/renderengine.cpp @@ -656,8 +656,6 @@ void RenderEngine::render(const glm::mat4 &projectionMatrix, const glm::mat4 &vi alpha = (p <= 0.f) ? 0.f : pow(p, 0.3f); } - alpha = 1.f; - // Since all log entries are ordered, once one exceeds alpha, all have if (alpha <= 0.0) break;