Merge pull request #1808 from Azaezel/consistentCallbacks1

clang: consistent callbacks
This commit is contained in:
Areloch 2016-10-24 01:25:09 -05:00 committed by GitHub
commit e8aff85322
10 changed files with 18 additions and 18 deletions

View file

@ -4514,7 +4514,7 @@ void Player::onImageAnimThreadUpdate(U32 imageSlot, S32 imageShapeIndex, F32 dt)
}
}
void Player::onUnmount( ShapeBase *obj, S32 node )
void Player::onUnmount( SceneObject *obj, S32 node )
{
// Reset back to root position during dismount.
setActionThread(PlayerData::RootAnim,true,false,false);