From 1312fe9017f33e81318214de4ef1861fa52ea47d Mon Sep 17 00:00:00 2001
From: Chris <chris@kizzx2.com>
Date: Sun, 20 Nov 2011 21:07:51 +0800
Subject: [PATCH] Fixed a big in OGLES driver

---
 .gitignore                       | 2 ++
 source/Irrlicht/COGLESDriver.cpp | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/.gitignore b/.gitignore
index a4082b8..b54d714 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,6 @@
 .svn
 build/
+*/build/
 xcuserdata/
 project.xcworkspace/
+lib/
diff --git a/source/Irrlicht/COGLESDriver.cpp b/source/Irrlicht/COGLESDriver.cpp
index 2b1cec8..db5a66f 100644
--- a/source/Irrlicht/COGLESDriver.cpp
+++ b/source/Irrlicht/COGLESDriver.cpp
@@ -2028,6 +2028,8 @@ void COGLES1Driver::setBasicRenderStates(const SMaterial& material, const SMater
 	// Filtering has to be set for each texture layer
 	for (u32 i=0; i<MaxTextureUnits; ++i)
 	{
+        if(!CurrentTexture[i])
+            continue;
 		if (MultiTextureExtension)
 			extGlActiveTexture(GL_TEXTURE0 + i);
 		else if (i>0)