aboutsummaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorCrazy-P2018-04-09 14:48:03 +0800
committerHein-Pieter van Braam2018-04-28 20:29:40 +0200
commite5a17617e637b8cb583043feb5b62afdf67bf599 (patch)
tree8ccc2e433ef660e34b0847f913c1d6dc84f80a36 /core
parent4e756d61c89de718694da6470eb9c14e6af03b34 (diff)
downloadgodot-e5a17617e637b8cb583043feb5b62afdf67bf599.tar.gz
godot-e5a17617e637b8cb583043feb5b62afdf67bf599.tar.zst
godot-e5a17617e637b8cb583043feb5b62afdf67bf599.zip
Resolves Inccorect Quaternion Conversion
Fixes https://github.com/godotengine/godot/issues/18025 (cherry picked from commit ae7a9df292c36dbc15d43b43017cd42efe5707c4)
Diffstat (limited to 'core')
-rw-r--r--core/math/quat.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/math/quat.cpp b/core/math/quat.cpp
index 9aa8b537d..4f61401ac 100644
--- a/core/math/quat.cpp
+++ b/core/math/quat.cpp
@@ -89,7 +89,7 @@ void Quat::set_euler_yxz(const Vector3 &p_euler) {
set(sin_a1 * cos_a2 * sin_a3 + cos_a1 * sin_a2 * cos_a3,
sin_a1 * cos_a2 * cos_a3 - cos_a1 * sin_a2 * sin_a3,
- -sin_a1 * sin_a2 * cos_a3 + cos_a1 * sin_a2 * sin_a3,
+ -sin_a1 * sin_a2 * cos_a3 + cos_a1 * cos_a2 * sin_a3,
sin_a1 * sin_a2 * sin_a3 + cos_a1 * cos_a2 * cos_a3);
}