- Reverted changes related to CallBack->OnSetMaterial call.

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

source/Irrlicht/CD3D8ShaderMaterialRenderer.cpp

@@ -137,10 +137,10 @@ void CD3D8ShaderMaterialRenderer::OnSetMaterial(const video::SMaterial& material
 
 		if (BaseMaterial)
 			BaseMaterial->OnSetMaterial(material, material, true, services);
-
-		if (CallBack)
-			CallBack->OnSetMaterial(material);
 	}
+
+	if (CallBack)
+		CallBack->OnSetMaterial(material);
 }
 
 void CD3D8ShaderMaterialRenderer::OnUnsetMaterial()

source/Irrlicht/CD3D9CgMaterialRenderer.cpp

@@ -89,10 +89,10 @@ void CD3D9CgMaterialRenderer::OnSetMaterial(const SMaterial& material, const SMa
 
 		if (BaseMaterial)
 			BaseMaterial->OnSetMaterial(material, material, true, this);
-
-		if (CallBack)
-			CallBack->OnSetMaterial(material);
 	}
+
+	if (CallBack)
+		CallBack->OnSetMaterial(material);
 }
 
 bool CD3D9CgMaterialRenderer::OnRender(IMaterialRendererServices* services, E_VERTEX_TYPE vtxtype)

source/Irrlicht/CD3D9ShaderMaterialRenderer.cpp

@@ -135,10 +135,10 @@ void CD3D9ShaderMaterialRenderer::OnSetMaterial(const video::SMaterial& material
 
 		if (BaseMaterial)
 			BaseMaterial->OnSetMaterial(material, material, true, services);
-
-		if (CallBack)
-			CallBack->OnSetMaterial(material);
 	}
+
+	if (CallBack)
+		CallBack->OnSetMaterial(material);
 }
 
 

source/Irrlicht/COpenGLCgMaterialRenderer.cpp

@@ -119,10 +119,10 @@ void COpenGLCgMaterialRenderer::OnSetMaterial(const SMaterial& material, const S
 
 		if (BaseMaterial)
 			BaseMaterial->OnSetBaseMaterial(material);
-
-		if (CallBack)
-			CallBack->OnSetMaterial(material);
 	}
+
+	if (CallBack)
+		CallBack->OnSetMaterial(material);
 }
 
 bool COpenGLCgMaterialRenderer::OnRender(IMaterialRendererServices* services, E_VERTEX_TYPE vtxtype)

source/Irrlicht/COpenGLSLMaterialRenderer.cpp

@@ -232,10 +232,10 @@ void COpenGLSLMaterialRenderer::OnSetMaterial(const video::SMaterial& material,
 
 		if (BaseMaterial)
 			BaseMaterial->OnSetBaseMaterial(material);
-
-		if (CallBack)
-			CallBack->OnSetMaterial(material);
 	}
+
+	if (CallBack)
+		CallBack->OnSetMaterial(material);
 }
 
 

source/Irrlicht/COpenGLShaderMaterialRenderer.cpp

@@ -182,10 +182,10 @@ void COpenGLShaderMaterialRenderer::OnSetMaterial(const video::SMaterial& materi
 
 		if (BaseMaterial)
 			BaseMaterial->OnSetBaseMaterial(material);
-
-		if (CallBack)
-			CallBack->OnSetMaterial(material);
 	}
+
+	if (CallBack)
+		CallBack->OnSetMaterial(material);
 }