diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2014-02-20 23:01:44 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2014-02-20 23:01:44 -0300 |
| commit | f2a068984c36de1f77940ae9d5dc0d017b8e642d (patch) | |
| tree | 870fc023ade48d3817624b32b301105e0b86bb9e /core/variant_op.cpp | |
| parent | 51c55b237b795fa4c085841dbf935c0bd103d5c7 (diff) | |
| download | redot-engine-f2a068984c36de1f77940ae9d5dc0d017b8e642d.tar.gz | |
-run script in editor
-add search docs dialog that returns places string was found
-added flash
Diffstat (limited to 'core/variant_op.cpp')
| -rw-r--r-- | core/variant_op.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/core/variant_op.cpp b/core/variant_op.cpp index f2bf16334e..109e4ab387 100644 --- a/core/variant_op.cpp +++ b/core/variant_op.cpp @@ -547,7 +547,14 @@ void Variant::evaluate(const Operator& p_op, const Variant& p_a, const Variant& DEFAULT_OP_FAIL(STRING); DEFAULT_OP_LOCALMEM_NUM(*,VECTOR2,Vector2); DEFAULT_OP_FAIL(RECT2); - DEFAULT_OP_FAIL(MATRIX32); + case MATRIX32: { + + if (p_b.type==MATRIX32) { + _RETURN( *p_a._data._matrix32 * *p_b._data._matrix32 ); + }; + r_valid=false; + return; + } break; DEFAULT_OP_LOCALMEM_NUM(*,VECTOR3,Vector3); DEFAULT_OP_FAIL(PLANE); DEFAULT_OP_FAIL(QUAT); |