diff options
| author | sanikoyes <sanikoyes@163.com> | 2014-04-06 21:52:47 +0800 |
|---|---|---|
| committer | sanikoyes <sanikoyes@163.com> | 2014-04-06 21:52:47 +0800 |
| commit | 77a840e350668a9c80b1e63b9b73aac44221c53b (patch) | |
| tree | 40d2115e639bdc72a61811ac4f2fb0f04ec8eb7f /core/variant_call.cpp | |
| parent | 14bbdcb139b35e6d206df1ab3176d34245b72329 (diff) | |
| parent | ded365031ede27b7a6efef59bc886343f58d310b (diff) | |
Merge branch 'master' into hotfix-android-unicode-ime-input
Diffstat (limited to 'core/variant_call.cpp')
| -rw-r--r-- | core/variant_call.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/variant_call.cpp b/core/variant_call.cpp index be1b0eb3d3..6ab33b7bcc 100644 --- a/core/variant_call.cpp +++ b/core/variant_call.cpp @@ -600,6 +600,7 @@ static void _call_##m_type##_##m_method(Variant& r_ret,Variant& p_self,const Var VCALL_PTR0R( Matrix3, determinant ); VCALL_PTR2R( Matrix3, rotated ); VCALL_PTR1R( Matrix3, scaled ); + VCALL_PTR0R( Matrix3, get_scale ); VCALL_PTR0R( Matrix3, get_euler ); VCALL_PTR1R( Matrix3, tdotx ); VCALL_PTR1R( Matrix3, tdoty ); @@ -1390,6 +1391,7 @@ _VariantCall::addfunc(Variant::m_vtype,Variant::m_ret,_SCS(#m_method),VCALL(m_cl ADDFUNC0(MATRIX3,REAL,Matrix3,determinant,varray()); ADDFUNC2(MATRIX3,MATRIX3,Matrix3,rotated,VECTOR3,"axis",REAL,"phi",varray()); ADDFUNC1(MATRIX3,MATRIX3,Matrix3,scaled,VECTOR3,"scale",varray()); + ADDFUNC0(MATRIX3,VECTOR3,Matrix3,get_scale,varray()); ADDFUNC0(MATRIX3,VECTOR3,Matrix3,get_euler,varray()); ADDFUNC1(MATRIX3,REAL,Matrix3,tdotx,VECTOR3,"with",varray()); ADDFUNC1(MATRIX3,REAL,Matrix3,tdoty,VECTOR3,"with",varray()); |