Merging trunk up to r39145.
[blender-staging.git] / source / gameengine / Converter / KX_BlenderSceneConverter.cpp
index b04a0d24e7820b265ba08d4f57a773ff0f42feb4..8f17cd0391b9e0bb5b8abcc7918ebe779e109a88 100644 (file)
@@ -566,18 +566,18 @@ void KX_BlenderSceneConverter::RegisterPolyMaterial(RAS_IPolyMaterial *polymat)
 
 
 void KX_BlenderSceneConverter::RegisterInterpolatorList(
-                                                                       BL_InterpolatorList *adtList,
-                                                                       struct AnimData *for_adt)
+                                                                       BL_InterpolatorList *actList,
+                                                                       struct bAction *for_act)
 {
-       m_map_blender_to_gameAdtList.insert(CHashedPtr(for_adt), adtList);
+       m_map_blender_to_gameAdtList.insert(CHashedPtr(for_act), actList);
 }
 
 
 
 BL_InterpolatorList *KX_BlenderSceneConverter::FindInterpolatorList(
-                                                                       struct AnimData *for_adt)
+                                                                       struct bAction *for_act)
 {
-       BL_InterpolatorList **listp = m_map_blender_to_gameAdtList[CHashedPtr(for_adt)];
+       BL_InterpolatorList **listp = m_map_blender_to_gameAdtList[CHashedPtr(for_act)];
                
        return listp?*listp:NULL;
 }