Browse Source

Merge pull request #93482 from TokageItLab/reset-attachment

Reset when disabling override pose in BoneAttachment3D
Rémi Verschelde 1 year ago
parent
commit
11db60e9c5
1 changed files with 11 additions and 0 deletions
  1. 11 0
      scene/3d/bone_attachment_3d.cpp

+ 11 - 0
scene/3d/bone_attachment_3d.cpp

@@ -239,9 +239,20 @@ int BoneAttachment3D::get_bone_idx() const {
 }
 
 void BoneAttachment3D::set_override_pose(bool p_override) {
+	if (override_pose == p_override) {
+		return;
+	}
+
 	override_pose = p_override;
 	set_notify_transform(override_pose);
 	set_process_internal(override_pose);
+	if (!override_pose && bone_idx >= 0) {
+		Skeleton3D *sk = _get_skeleton3d();
+		if (sk) {
+			sk->reset_bone_pose(bone_idx);
+		}
+	}
+
 	notify_property_list_changed();
 }