[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54772] trunk/blender/source/gameengine/ Ketsji/KX_ObColorIpoSGController.cpp: BGE: Object color channels can now be animated separately without zeroing out the other channels .

[Mitchell Stokes]

Revision: 54772
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54772
Author:   moguri
Date:     2013-02-23 01:17:01 +0000 (Sat, 23 Feb 2013)
Log Message:
-----------
BGE: Object color channels can now be animated separately without zeroing out the other channels. Problem reported by Dalai via IRC.

Modified Paths:
--------------
    trunk/blender/source/gameengine/Ketsji/KX_ObColorIpoSGController.cpp

Modified: trunk/blender/source/gameengine/Ketsji/KX_ObColorIpoSGController.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_ObColorIpoSGController.cpp	2013-02-23 01:12:23 UTC (rev 54771)
+++ trunk/blender/source/gameengine/Ketsji/KX_ObColorIpoSGController.cpp	2013-02-23 01:17:01 UTC (rev 54772)
@@ -45,20 +45,17 @@
 {
 	if (m_modified)
 	{
-		m_rgba[0]=0;
-		m_rgba[1]=0;
-		m_rgba[2]=0;
-		m_rgba[3]=0;
+		SG_Spatial* ob = (SG_Spatial*)m_pObject;
+		KX_GameObject* kxgameobj= (KX_GameObject*) ob->GetSGClientObject();
 
+		m_rgba = kxgameobj->GetObjectColor();
+
 		T_InterpolatorList::iterator i;
 		for (i = m_interpolators.begin(); !(i == m_interpolators.end()); ++i) {
 			(*i)->Execute(m_ipotime);
 		}
 		
 
-		SG_Spatial* ob = (SG_Spatial*)m_pObject;
-		KX_GameObject* kxgameobj= (KX_GameObject*) ob->GetSGClientObject();
-
 		kxgameobj->SetObjectColor(m_rgba);