diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2014-08-14 11:59:35 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2014-08-14 11:59:35 -0300 |
| commit | 89fa70706f9166765c3ac3f799225a467800f065 (patch) | |
| tree | e0c12afe0f868cb68ad02ec1f6177969c795a7b0 /core | |
| parent | 2ee4ac183babedd679e901b0158f5268556deceb (diff) | |
-Fixed pull request overwrite by mistake
-Forgot to mention that lightmap baking to texture was implemented in latest push.
Diffstat (limited to 'core')
| -rw-r--r-- | core/variant_call.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/core/variant_call.cpp b/core/variant_call.cpp index db6b3d9771..2697e6f7a7 100644 --- a/core/variant_call.cpp +++ b/core/variant_call.cpp @@ -574,6 +574,7 @@ static void _call_##m_type##_##m_method(Variant& r_ret,Variant& p_self,const Var VCALL_PTR0R( Matrix32, affine_inverse ); VCALL_PTR0R( Matrix32, get_rotation ); VCALL_PTR0R( Matrix32, get_origin ); + VCALL_PTR0R( Matrix32, get_scale ); VCALL_PTR0R( Matrix32, orthonormalized ); VCALL_PTR1R( Matrix32, rotated ); VCALL_PTR1R( Matrix32, scaled ); @@ -1167,8 +1168,8 @@ _VariantCall::addfunc(Variant::m_vtype,Variant::m_ret,_SCS(#m_method),VCALL(m_cl ADDFUNC1(STRING,STRING,String,ord_at,INT,"at",varray()); // ADDFUNC2(STRING,String,erase,INT,INT,varray()); ADDFUNC0(STRING,INT,String,hash,varray()); - ADDFUNC0(STRING,INT,String,md5_text,varray()); - ADDFUNC0(STRING,INT,String,md5_buffer,varray()); + ADDFUNC0(STRING,STRING,String,md5_text,varray()); + ADDFUNC0(STRING,RAW_ARRAY,String,md5_buffer,varray()); ADDFUNC0(STRING,BOOL,String,empty,varray()); ADDFUNC0(STRING,BOOL,String,is_abs_path,varray()); ADDFUNC0(STRING,BOOL,String,is_rel_path,varray()); @@ -1391,6 +1392,7 @@ _VariantCall::addfunc(Variant::m_vtype,Variant::m_ret,_SCS(#m_method),VCALL(m_cl ADDFUNC0(MATRIX32,MATRIX32,Matrix32,affine_inverse,varray()); ADDFUNC0(MATRIX32,REAL,Matrix32,get_rotation,varray()); ADDFUNC0(MATRIX32,VECTOR2,Matrix32,get_origin,varray()); + ADDFUNC0(MATRIX32,VECTOR2,Matrix32,get_scale,varray()); ADDFUNC0(MATRIX32,MATRIX32,Matrix32,orthonormalized,varray()); ADDFUNC1(MATRIX32,MATRIX32,Matrix32,rotated,REAL,"phi",varray()); ADDFUNC1(MATRIX32,MATRIX32,Matrix32,scaled,VECTOR2,"scale",varray()); |