[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17031] trunk/blender/source/gameengine/ Converter/KX_BlenderScalarInterpolator.cpp: Fix crash in game engine IPO code, got out of sync after IPO cleanup, removed the duplicated function declarations.

[Brecht Van Lommel]

Revision: 17031
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17031
Author:   blendix
Date:     2008-10-12 00:29:50 +0200 (Sun, 12 Oct 2008)

Log Message:
-----------
Fix crash in game engine IPO code, got out of sync after IPO cleanup, removed 
the duplicated function declarations.

Modified Paths:
--------------
    trunk/blender/source/gameengine/Converter/KX_BlenderScalarInterpolator.cpp

Modified: 
trunk/blender/source/gameengine/Converter/KX_BlenderScalarInterpolator.cpp
===================================================================
--- trunk/blender/source/gameengine/Converter/KX_BlenderScalarInterpolator.cpp  
2008-10-11 22:16:39 UTC (rev 17030)
+++ trunk/blender/source/gameengine/Converter/KX_BlenderScalarInterpolator.cpp  
2008-10-11 22:29:50 UTC (rev 17031)
@@ -28,21 +28,18 @@
 
 #include "KX_BlenderScalarInterpolator.h"
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+extern "C" {
+#include "DNA_ipo_types.h"
+#include "BKE_ipo.h"
+}
 
-extern "C" int IPO_GetChannels(struct Ipo *ipo, short *channels);
-extern "C" float IPO_GetFloatValue(struct Ipo *ipo, /*IPO_Channel*/ short 
channel, float ctime);
-
-
 static const int BL_MAX_CHANNELS = 32;
 
 float BL_ScalarInterpolator::GetValue(float currentTime) const {
        return IPO_GetFloatValue(m_blender_ipo, m_channel, currentTime);
 }
 
-typedef short IPO_Channel;  
+ 
 
 BL_InterpolatorList::BL_InterpolatorList(struct Ipo *ipo) {
        IPO_Channel channels[BL_MAX_CHANNELS];


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs