1 files changed, 16 insertions, 20 deletions

diff --git a/scene/animation/animation_tree.cpp b/scene/animation/animation_tree.cpp
index 60f2623267..424716e002 100644
--- a/scene/animation/animation_tree.cpp
+++ b/scene/animation/animation_tree.cpp
@@ -541,9 +541,9 @@ bool AnimationTree::_update_caches(AnimationPlayer *player) {
 	player->get_animation_list(&sname);
 
 	Ref<Animation> reset_anim;
-	bool has_reset_anim = player->has_animation("RESET");
+	bool has_reset_anim = player->has_animation(SceneStringNames::get_singleton()->RESET);
 	if (has_reset_anim) {
-		reset_anim = player->get_animation("RESET");
+		reset_anim = player->get_animation(SceneStringNames::get_singleton()->RESET);
 	}
 	for (const StringName &E : sname) {
 		Ref<Animation> anim = player->get_animation(E);
@@ -623,16 +623,17 @@ bool AnimationTree::_update_caches(AnimationPlayer *player) {
 						track_xform->skeleton = nullptr;
 						track_xform->bone_idx = -1;
 
+						bool has_rest = false;
 						if (path.get_subname_count() == 1 && Object::cast_to<Skeleton3D>(node_3d)) {
 							Skeleton3D *sk = Object::cast_to<Skeleton3D>(node_3d);
 							track_xform->skeleton = sk;
 							int bone_idx = sk->find_bone(path.get_subname(0));
 							if (bone_idx != -1) {
+								has_rest = true;
 								track_xform->bone_idx = bone_idx;
 								Transform3D rest = sk->get_bone_rest(bone_idx);
 								track_xform->init_loc = rest.origin;
-								track_xform->ref_rot = rest.basis.get_rotation_quaternion();
-								track_xform->init_rot = track_xform->ref_rot.log();
+								track_xform->init_rot = rest.basis.get_rotation_quaternion();
 								track_xform->init_scale = rest.basis.get_scale();
 							}
 						}
@@ -656,7 +657,8 @@ bool AnimationTree::_update_caches(AnimationPlayer *player) {
 							}
 						}
 
-						if (has_reset_anim) {
+						// For non Skeleton3D bone animation.
+						if (has_reset_anim && !has_rest) {
 							int rt = reset_anim->find_track(path, track_type);
 							if (rt >= 0 && reset_anim->track_get_key_count(rt) > 0) {
 								switch (track_type) {
@@ -664,8 +666,7 @@ bool AnimationTree::_update_caches(AnimationPlayer *player) {
 										track_xform->init_loc = reset_anim->track_get_key_value(rt, 0);
 									} break;
 									case Animation::TYPE_ROTATION_3D: {
-										track_xform->ref_rot = reset_anim->track_get_key_value(rt, 0);
-										track_xform->init_rot = track_xform->ref_rot.log();
+										track_xform->init_rot = reset_anim->track_get_key_value(rt, 0);
 									} break;
 									case Animation::TYPE_SCALE_3D: {
 										track_xform->init_scale = reset_anim->track_get_key_value(rt, 0);
@@ -998,7 +999,7 @@ void AnimationTree::_process_graph(double p_delta) {
 							if (t->process_pass != process_pass) {
 								t->process_pass = process_pass;
 								t->loc = Vector3(0, 0, 0);
-								t->rot = Quaternion(0, 0, 0, 0);
+								t->rot = Quaternion(0, 0, 0, 1);
 								t->scale = Vector3(0, 0, 0);
 							}
 							double prev_time = time - delta;
@@ -1094,7 +1095,7 @@ void AnimationTree::_process_graph(double p_delta) {
 							if (t->process_pass != process_pass) {
 								t->process_pass = process_pass;
 								t->loc = Vector3(0, 0, 0);
-								t->rot = Quaternion(0, 0, 0, 0);
+								t->rot = Quaternion(0, 0, 0, 1);
 								t->scale = Vector3(0, 0, 0);
 							}
 							double prev_time = time - delta;
@@ -1141,7 +1142,7 @@ void AnimationTree::_process_graph(double p_delta) {
 										continue;
 									}
 									a->rotation_track_interpolate(i, (double)a->get_length(), &rot[1]);
-									t->rot += (rot[1].log() - rot[0].log()) * blend;
+									t->rot = (t->rot * Quaternion().slerp(rot[0].inverse() * rot[1], blend)).normalized();
 									prev_time = 0;
 								}
 							} else {
@@ -1151,7 +1152,7 @@ void AnimationTree::_process_graph(double p_delta) {
 										continue;
 									}
 									a->rotation_track_interpolate(i, 0, &rot[1]);
-									t->rot += (rot[1].log() - rot[0].log()) * blend;
+									t->rot = (t->rot * Quaternion().slerp(rot[0].inverse() * rot[1], blend)).normalized();
 									prev_time = 0;
 								}
 							}
@@ -1162,7 +1163,7 @@ void AnimationTree::_process_graph(double p_delta) {
 							}
 
 							a->rotation_track_interpolate(i, time, &rot[1]);
-							t->rot += (rot[1].log() - rot[0].log()) * blend;
+							t->rot = (t->rot * Quaternion().slerp(rot[0].inverse() * rot[1], blend)).normalized();
 							prev_time = !backward ? 0 : (double)a->get_length();
 
 						} else {
@@ -1179,10 +1180,7 @@ void AnimationTree::_process_graph(double p_delta) {
 								continue;
 							}
 
-							if (signbit(rot.dot(t->ref_rot))) {
-								rot = -rot;
-							}
-							t->rot += (rot.log() - t->init_rot) * blend;
+							t->rot = (t->rot * Quaternion().slerp(t->init_rot.inverse() * rot, blend)).normalized();
 						}
 #endif // _3D_DISABLED
 					} break;
@@ -1193,7 +1191,7 @@ void AnimationTree::_process_graph(double p_delta) {
 							if (t->process_pass != process_pass) {
 								t->process_pass = process_pass;
 								t->loc = Vector3(0, 0, 0);
-								t->rot = Quaternion(0, 0, 0, 0);
+								t->rot = Quaternion(0, 0, 0, 1);
 								t->scale = Vector3(0, 0, 0);
 							}
 							double prev_time = time - delta;
@@ -1321,9 +1319,8 @@ void AnimationTree::_process_graph(double p_delta) {
 								if (!t->init_value) {
 									t->init_value = value;
 									t->init_value.zero();
-								} else {
-									t->value = t->init_value;
 								}
+								t->value = t->init_value;
 							}
 
 							Variant::sub(value, t->init_value, value);
@@ -1583,7 +1580,6 @@ void AnimationTree::_process_graph(double p_delta) {
 				case Animation::TYPE_POSITION_3D: {
 #ifndef _3D_DISABLED
 					TrackCacheTransform *t = static_cast<TrackCacheTransform *>(track);
-					t->rot = t->rot.exp();
 
 					if (t->root_motion) {
 						Transform3D xform;