Merge branch 'master' of github.com:OpenSpace/OpenSpace

This commit is contained in:
Emil Axelsson
2018-11-14 17:07:56 +01:00
19 changed files with 803 additions and 73 deletions
@@ -74,10 +74,16 @@ void GUIRenderHandler::draw() {
return;
}
if (!isTextureReady()) {
return;
}
if (_programObject->isDirty()) {
_programObject->rebuildFromFile();
}
updateTexture();
glEnable(GL_BLEND);
glBlendEquation(GL_FUNC_ADD);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);