From c1df6e9d1528fc2513c6f455f0c0ccc6ca74e34a Mon Sep 17 00:00:00 2001 From: James Turner Date: Fri, 20 Oct 2017 17:25:06 +0100 Subject: [PATCH] Hack to fix Windows build. glBlendFuncSeperate will need some ugly trick to use in CanvasWidget, I better find another way. --- src/GUI/CanvasWidget.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/GUI/CanvasWidget.cxx b/src/GUI/CanvasWidget.cxx index c210aadd1..56fe05a7b 100644 --- a/src/GUI/CanvasWidget.cxx +++ b/src/GUI/CanvasWidget.cxx @@ -197,8 +197,8 @@ void CanvasWidget::setSize(int w, int h) void CanvasWidget::draw(int dx, int dy) { glEnable(GL_TEXTURE_2D); - glEnable(GL_BLEND); - glBlendFuncSeparate(GL_ONE, GL_ZERO, GL_ZERO, GL_ONE); + // glEnable(GL_BLEND); + // glBlendFuncSeparate(GL_ONE, GL_ZERO, GL_ZERO, GL_ONE); glBindTexture(GL_TEXTURE_2D, _canvas_mgr->getCanvasTexId(_canvas)); glBegin( GL_QUADS ); @@ -209,5 +209,5 @@ void CanvasWidget::draw(int dx, int dy) glTexCoord2f(0,1); glVertex2f(dx + abox.min[0], dy + abox.max[1]); glEnd(); glDisable(GL_TEXTURE_2D); - glDisable(GL_BLEND); + // glDisable(GL_BLEND); }