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

1 files changed, 5 insertions, 8 deletions

diff --git a/source/gameengine/Converter/KX_BlenderScalarInterpolator.cpp b/source/gameengine/Converter/KX_BlenderScalarInterpolator.cpp
index f58d60b026a..4d79febb7b4 100644
--- a/source/gameengine/Converter/KX_BlenderScalarInterpolator.cpp
+++ b/source/gameengine/Converter/KX_BlenderScalarInterpolator.cpp
@@ -28,13 +28,10 @@
 
 #include "KX_BlenderScalarInterpolator.h"
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-extern "C" int IPO_GetChannels(struct Ipo *ipo, short *channels);
-extern "C" float IPO_GetFloatValue(struct Ipo *ipo, /*IPO_Channel*/ short channel, float ctime);
-
+extern "C" {
+#include "DNA_ipo_types.h"
+#include "BKE_ipo.h"
+}
 
 static const int BL_MAX_CHANNELS = 32;
 
@@ -42,7 +39,7 @@ 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];