Properly reset renderstate. Remove extra no-op.

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

source/Irrlicht/COgreMeshFileLoader.h

@@ -135,7 +135,7 @@ private:
 	struct OgreVertexBuffer
 	{
 		OgreVertexBuffer() : BindIndex(0), VertexSize(0), Data(0) {}
-		void destroy() { delete [] Data; Data = 0; };
+		void destroy() { delete [] Data; Data = 0; }
 
 		u16 BindIndex,
 		VertexSize;

source/Irrlicht/COpenGLMaterialRenderer.h

@@ -446,9 +446,11 @@ public:
 		if (Driver->queryFeature(EVDF_MULTITEXTURE))
 		{
 			Driver->extGlActiveTexture(GL_TEXTURE1_ARB);
+			glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
 			glTexEnvf(GL_TEXTURE_ENV, GL_RGB_SCALE_EXT, 1.f );
 			Driver->extGlActiveTexture(GL_TEXTURE0_ARB);
 		}
+		glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
 	}
 };