- Fixed issue related to crash at draw2DImage methods.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4986 dfc29bdd-3216-0410-991c-e03cc46cb475

source/Irrlicht/COpenGLDriver.cpp

@@ -2643,7 +2643,10 @@ void COpenGLDriver::setMaterial(const SMaterial& material)
 	OverrideMaterial.apply(Material);
 
 	for (u32 i = 0; i < MaxTextureUnits; ++i)
+	{
 		setActiveTexture(i, material.getTexture(i));
+		setTransform((E_TRANSFORMATION_STATE)(ETS_TEXTURE_0 + i), material.getTextureMatrix(i));
+	}
 }
 
 
@@ -3296,33 +3299,20 @@ void COpenGLDriver::setTextureRenderStates(const SMaterial& material, bool reset
 	{
 		const COpenGLTexture* tmpTexture = static_cast<const COpenGLTexture*>(CurrentTexture[i]);
 
+		bool fixedPipeline = false;
+
 		if(FixedPipelineState == EOFPS_ENABLE || FixedPipelineState == EOFPS_DISABLE_TO_ENABLE)
 		{
 			if (i>0 && !MultiTextureExtension)
 				break;
 
-			if (!CurrentTexture[i])
-			{
-				BridgeCalls->setTexture(i, true);
+			fixedPipeline = true;
+		}
 
-				continue;
-			}
-			else
-			{
-				BridgeCalls->setTexture(i, true);
+		BridgeCalls->setTexture(i, fixedPipeline);
 
-				setTransform ((E_TRANSFORMATION_STATE) (ETS_TEXTURE_0 + i), material.getTextureMatrix(i));
-			}
-		}
-		else
-		{
-			if (CurrentTexture[i])
-			{
-				BridgeCalls->setTexture(i, false);
-			}
-			else
-				continue;
-		}
+		if (!CurrentTexture[i])
+			continue;
 
 		if(resetAllRenderstates)
 			tmpTexture->getStatesCache().IsCached = false;