diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-02-10 12:32:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-10 12:32:32 +0100 |
| commit | b6e03d927eb94500284e0214f7045a9830f4813c (patch) | |
| tree | 5026836827f912973eead7d41e5e63bfbe736964 /servers | |
| parent | 6c57bdf6ff02c566efc0d3a8b84f5d0393a69894 (diff) | |
| parent | 3f837d5cc52a4dd18df05efcf348bb99bb33a708 (diff) | |
Merge pull request #25727 from aaronfranke/matrix3-basis
[Core] Rename Matrix3 file to Basis
Diffstat (limited to 'servers')
| -rw-r--r-- | servers/physics/body_sw.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/servers/physics/body_sw.cpp b/servers/physics/body_sw.cpp index 23f16c246e..f0fbbafe1c 100644 --- a/servers/physics/body_sw.cpp +++ b/servers/physics/body_sw.cpp @@ -652,7 +652,7 @@ void BodySW::simulate_motion(const Transform& p_xform,real_t p_step) { linear_velocity=(p_xform.origin - get_transform().origin)/p_step; //compute a FAKE angular velocity, not so easy - Matrix3 rot=get_transform().basis.orthonormalized().transposed() * p_xform.basis.orthonormalized(); + Basis rot=get_transform().basis.orthonormalized().transposed() * p_xform.basis.orthonormalized(); Vector3 axis; real_t angle; |