From 86c457716abe381f1e264b7fb523a6ad470f1c1a Mon Sep 17 00:00:00 2001 From: Shinya Kitaoka Date: Apr 26 2016 13:52:47 +0000 Subject: Merge pull request #251 from skitaoka/fix/remove-glext-h Fix glext.h --- diff --git a/toonz/sources/include/tgl.h b/toonz/sources/include/tgl.h index 980008e..1a4f7e7 100644 --- a/toonz/sources/include/tgl.h +++ b/toonz/sources/include/tgl.h @@ -10,7 +10,6 @@ #include #include #include -#include #endif #ifdef MACOSX diff --git a/toonz/sources/tnzext/meshutils.cpp b/toonz/sources/tnzext/meshutils.cpp index 3e65b8a..52d4e16 100644 --- a/toonz/sources/tnzext/meshutils.cpp +++ b/toonz/sources/tnzext/meshutils.cpp @@ -320,6 +320,7 @@ void tglDraw(const TMeshImage &meshImage, const PlasticDeformerDataGroup &group) { #ifdef _WIN32 + typedef void (*PFNGLBLENDFUNCSEPARATEPROC)(GLenum, GLenum, GLenum, GLenum); static PFNGLBLENDFUNCSEPARATEPROC const glBlendFuncSeparate = reinterpret_cast(::wglGetProcAddress("glBlendFuncSeparate")); #endif