diff options
| author | reduz <reduzio@gmail.com> | 2014-04-05 09:30:56 -0300 |
|---|---|---|
| committer | reduz <reduzio@gmail.com> | 2014-04-05 09:30:56 -0300 |
| commit | 266ff7201b4a4a0fa1be336f291c3d1f5a395981 (patch) | |
| tree | b4cfba44af4b7602b3cfa001782bcb70c958a1e4 | |
| parent | f0371e6075b27141d8f8739ed422f37d31c3e542 (diff) | |
| parent | 6e1e66878c988e921ceea8c19d3dd3b6ff882965 (diff) | |
Merge pull request #232 from marynate/PR-fix-variant-multiply-bug
Fix Variant vector2/vecotor3 multiply bug
| -rw-r--r-- | core/variant_op.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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;\ |