merged from master

2019-03-16 23:10:15 +11:00
parent 230ce1840d 445c8299e7
commit bf36f68218
28 changed files with 187 additions and 91 deletions
@@ -301,7 +301,6 @@ void RenderThread::paint() {

  glEnable(GL_TEXTURE_2D);
  glEnable(GL_BLEND);
-  glEnable(GL_DEPTH);

  compose_sequence(params);

@@ -346,7 +345,6 @@ void RenderThread::paint() {
    pixel_buffer = nullptr;
  }

-  glDisable(GL_DEPTH);
  glDisable(GL_BLEND);
  glDisable(GL_TEXTURE_2D);