From bb0358dd8d3ed99c9fb3545efdf821d28e73b68b Mon Sep 17 00:00:00 2001 From: Eric Rybicki Date: Sat, 25 Jan 2020 10:06:14 +0100 Subject: Use a new approach to fix bone pose override not being reset when IK animation is stopped. This reverts PR #35460 & commit 551c37167b0428b1489a8a6f6233624c5f4aa628. --- scene/animation/skeleton_ik.cpp | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'scene/animation/skeleton_ik.cpp') diff --git a/scene/animation/skeleton_ik.cpp b/scene/animation/skeleton_ik.cpp index 46028a9ce2..518c243dd0 100644 --- a/scene/animation/skeleton_ik.cpp +++ b/scene/animation/skeleton_ik.cpp @@ -329,17 +329,6 @@ void FabrikInverseKinematic::solve(Task *p_task, real_t blending_delta, bool ove } } -void FabrikInverseKinematic::reset(Task *p_task) { - ChainItem *ci(&p_task->chain.chain_root); - while (ci) { - p_task->skeleton->set_bone_global_pose_override(ci->bone, Transform(), 0); - if (!ci->children.empty()) - ci = &ci->children.write[0]; - else - ci = NULL; - } -} - void SkeletonIK::_validate_property(PropertyInfo &property) const { if (property.name == "root_bone" || property.name == "tip_bone") { @@ -542,8 +531,6 @@ void SkeletonIK::start(bool p_one_time) { void SkeletonIK::stop() { set_process_internal(false); - if (task) - FabrikInverseKinematic::reset(task); } Transform SkeletonIK::_get_target_transform() { -- cgit v1.2.3