diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-02-26 22:42:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-26 22:42:31 +0100 |
| commit | 1bd0fd90cc40349df9951b24244c1cfb6d3c494b (patch) | |
| tree | 7a5f0f85d258d85976f362c6108bb27d8c390961 | |
| parent | 636e48b707e0b3d062ca073b92e2fff47460baf5 (diff) | |
| parent | 60daa9d7183afa9aebde022d6fb14a2b21fbbd9b (diff) | |
Merge pull request #17046 from NathanWarden/fixed_mono_marshalling
[Mono] The marshalling *in* of Transform was also incorrect.
| -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 8fd437223f..4e28622adb 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[1], m_in[2], m_in[3], m_in[4], m_in[5], m_in[6], m_in[7], m_in[8]), \ + 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]), \ Vector3(m_in[9], m_in[10], m_in[11])); // AABB |