diff options
| author | Hein-Pieter van Braam | 2018-02-27 15:59:35 +0100 |
|---|---|---|
| committer | Hein-Pieter van Braam | 2018-02-27 17:52:18 +0100 |
| commit | d7430ef0774a169bdb9be7f0c54586ec0b0c7d92 (patch) | |
| tree | ba8559fe9475afa74ea440c0c25a83628a759881 | |
| parent | 17408bea9c8c69da3d7548e6b9bc8198217717d2 (diff) | |
| download | godot-d7430ef0774a169bdb9be7f0c54586ec0b0c7d92.tar.gz godot-d7430ef0774a169bdb9be7f0c54586ec0b0c7d92.tar.zst godot-d7430ef0774a169bdb9be7f0c54586ec0b0c7d92.zip | |
Revert "The marshalling in was also incorrect."
This reverts commit b6f958965be2024b1618aa96e6e5d3c772cab6cc.
The fixes for these issues aren't quite baked yet. Taking them out of
3.0.2
| -rw-r--r-- | modules/mono/mono_gd/gd_mono_marshal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/mono/mono_gd/gd_mono_marshal.h b/modules/mono/mono_gd/gd_mono_marshal.h index 4e28622ad..8fd437223 100644 --- a/modules/mono/mono_gd/gd_mono_marshal.h +++ b/modules/mono/mono_gd/gd_mono_marshal.h @@ -201,7 +201,7 @@ Dictionary mono_object_to_Dictionary(MonoObject *p_dict); m_in.origin.x, m_in.origin.y, m_in.origin.z \ }; #define MARSHALLED_IN_Transform(m_in, m_out) Transform m_out( \ - Basis(m_in[0], m_in[3], m_in[6], m_in[1], m_in[4], m_in[7], m_in[2], m_in[5], m_in[8]), \ + Basis(m_in[0], m_in[1], m_in[2], m_in[3], m_in[4], m_in[5], m_in[6], m_in[7], m_in[8]), \ Vector3(m_in[9], m_in[10], m_in[11])); // AABB |