Merging r6488 through r6491 from trunk to ogl-es branch

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6492 dfc29bdd-3216-0410-991c-e03cc46cb475

tests/material.cpp

@@ -71,9 +71,41 @@ static bool polygonOffset(video::E_DRIVER_TYPE type)
     return result;
 }
 
+static bool testSMaterial()
+{
+	irr::video::SMaterial a;
+	irr::video::SMaterial b;
+
+	// Same by default?
+	if ( !(a == b) )
+		return false;
+	if ( a != b )
+		return false;
+
+	// getting (creating) one texture matrix shouldn't change things
+	b.TextureLayer[0].getTextureMatrix();
+	if ( a != b )
+		return false;
+
+	// no longer same now
+	b.TextureLayer[0].getTextureMatrix().setTextureScale(5.f, 0.5f);
+	if ( a == b )
+		return false;
+
+	return true;
+}
+
 bool material()
 {
 	bool result = true;
+
 	TestWithAllDrivers(polygonOffset);
+
+	if ( !testSMaterial() )
+	{
+		logTestString("testSMaterial failed\n\n");
+		result = false;
+	}
+
 	return result;
 }