MoNTE48
/
irrlicht
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix 2dmaterial override as in ogl-es2 driver. Remove unused include of windows.h 

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3784 dfc29bdd-3216-0410-991c-e03cc46cb475
master
hybrid 2011-06-03 23:17:23 +00:00
parent 46de5f022f
commit 88a8a5710b
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/Irrlicht/COGLESDriver.cpp
View File

@ -2217,7 +2217,7 @@ void COGLES1Driver::setRenderStates2DMode(bool alpha, bool texture, bool alphaCh
if (texture)
{
if (!OverrideMaterial2D)
if (!OverrideMaterial2DEnabled)
{
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);

6
source/Irrlicht/COGLESDriver.h
View File

@ -7,11 +7,7 @@
#include "IrrCompileConfig.h"
#if defined(_IRR_WINDOWS_API_)
// include windows headers for HWND
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#elif defined(_IRR_COMPILE_WITH_OSX_DEVICE_)
#if defined(_IRR_COMPILE_WITH_OSX_DEVICE_)
#include "MacOSX/CIrrDeviceMacOSX.h"
#elif defined(_IRR_COMPILE_WITH_IPHONE_DEVICE_)
#include "CIrrDeviceIPhone.h"