From 19c2b374648df52724a1fda20c34128270874f51 Mon Sep 17 00:00:00 2001 From: Celtic Minstrel Date: Sat, 19 Apr 2014 08:50:42 -0400 Subject: [PATCH] Remove redundant scissor disable and include conditional for OpenGL header - Because Apple puts it in a different place than every other platform --- osx/tools/graphtool.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/osx/tools/graphtool.cpp b/osx/tools/graphtool.cpp index 649ef7e3..9be3e12d 100644 --- a/osx/tools/graphtool.cpp +++ b/osx/tools/graphtool.cpp @@ -11,7 +11,11 @@ #include "cursors.h" #include "restypes.hpp" #include +#ifdef __APPLE__ #include +#else +#include +#endif #include #include using boost::math::constants::pi; @@ -1116,7 +1120,6 @@ void tileImage(sf::RenderTarget& target, RECT area, sf::Texture& img, RECT srcRe clip_rect(target, clipArea); target.draw(tessel, renderMode); undo_clip(target); - glDisable(GL_SCISSOR_TEST); } #if 0