[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15759] branches/apricot/source/gameengine /Ketsji/KX_GameObject.cpp: Apricot Branch: bugfix, don't let material ipo' s update the

[Brecht Van Lommel]

Revision: 15759
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15759
Author:   blendix
Date:     2008-07-25 12:55:10 +0200 (Fri, 25 Jul 2008)

Log Message:
-----------
Apricot Branch: bugfix, don't let material ipo's update the
obcolor in the game engine, otherwise there's two ipo's
updating the same value, and which one is the final value is
undefined.

Modified Paths:
--------------
    branches/apricot/source/gameengine/Ketsji/KX_GameObject.cpp

Modified: branches/apricot/source/gameengine/Ketsji/KX_GameObject.cpp
===================================================================
--- branches/apricot/source/gameengine/Ketsji/KX_GameObject.cpp	2008-07-25 10:52:10 UTC (rev 15758)
+++ branches/apricot/source/gameengine/Ketsji/KX_GameObject.cpp	2008-07-25 10:55:10 UTC (rev 15759)
@@ -460,7 +460,6 @@
 			RAS_IPolyMaterial* poly = (*mit)->GetPolyMaterial();
 			if(poly->GetFlag() & RAS_BLENDERMAT )
 			{
-				SetObjectColor(rgba);
 				KX_BlenderMaterial *m =  static_cast<KX_BlenderMaterial*>(poly);
 				m->UpdateIPO(rgba, specrgb,hard,spec,ref,emit, alpha);
 			}