Skip to content

Commit

Permalink
UPBGE: Fix blendin in action actuator.
Browse files Browse the repository at this point in the history
Blendin wasn't passed to BL_Action::Play from the actuator.

Fix issue: #605.
  • Loading branch information
panzergame committed Oct 8, 2017
1 parent 4017343 commit bcfd59e
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion source/gameengine/Converter/BL_ActionActuator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ void BL_ActionActuator::DecLink()
bool BL_ActionActuator::Play(KX_GameObject *obj, float start, float end, short mode)
{
const short blendmode = (m_blendmode == ACT_ACTION_ADD) ? BL_Action::ACT_BLEND_ADD : BL_Action::ACT_BLEND_BLEND;
return obj->PlayAction(m_action->id.name + 2, start, end, m_layer, m_priority, 0, mode, m_layer_weight, m_ipo_flags, 1.f, blendmode);
return obj->PlayAction(m_action->id.name + 2, start, end, m_layer, m_priority, m_blendin, mode, m_layer_weight, m_ipo_flags, 1.0f, blendmode);
}

#ifdef WITH_PYTHON
Expand Down

0 comments on commit bcfd59e

Please sign in to comment.