diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/variant_call.cpp | 2 | ||||
| -rw-r--r-- | core/variant_op.cpp | 4 |
2 files changed, 4 insertions, 2 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()); diff --git a/core/variant_op.cpp b/core/variant_op.cpp index 50908bbf94..7f46f4c322 100644 --- a/core/variant_op.cpp +++ b/core/variant_op.cpp @@ -103,8 +103,8 @@ case m_name: {\ case BOOL: _RETURN( p_a._data.m_type m_op p_b._data._bool);\ case INT: _RETURN( p_a._data.m_type m_op p_b._data._int);\ case REAL: _RETURN( p_a._data.m_type m_op p_b._data._real);\ - case VECTOR2: _RETURN( p_a._data.m_type m_op *reinterpret_cast<const Vector2*>(p_a._data._mem));\ - case VECTOR3: _RETURN( p_a._data.m_type m_op *reinterpret_cast<const Vector3*>(p_a._data._mem));\ + case VECTOR2: _RETURN( p_a._data.m_type m_op *reinterpret_cast<const Vector2*>(p_b._data._mem));\ + case VECTOR3: _RETURN( p_a._data.m_type m_op *reinterpret_cast<const Vector3*>(p_b._data._mem));\ default: {}\ }\ r_valid=false;\ |