godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #17046 from NathanWarden/fixed_mono_marshalling 

[Mono] The marshalling *in* of Transform was also incorrect.
This commit is contained in:
Rémi Verschelde 2018-02-26 22:42:31 +01:00 committed by GitHub
parent 636e48b707 60daa9d718
commit 1bd0fd90cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/mono/mono_gd/gd_mono_marshal.h
View File

@ -201,7 +201,7 @@ Dictionary mono_object_to_Dictionary(MonoObject *p_dict);
m_in.origin.x, m_in.origin.y, m_in.origin.z \ m_in.origin.x, m_in.origin.y, m_in.origin.z \
}; };
#define MARSHALLED_IN_Transform(m_in, m_out) Transform m_out( \ #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])); Vector3(m_in[9], m_in[10], m_in[11]));
// AABB // AABB