diff options
| author | Kanabenki <18357657+Kanabenki@users.noreply.github.com> | 2018-11-24 18:57:11 +0100 |
|---|---|---|
| committer | Kanabenki <18357657+Kanabenki@users.noreply.github.com> | 2018-11-24 18:57:29 +0100 |
| commit | 33a7fae1275ed17b6799c5bee5dfdb538ec9b8fe (patch) | |
| tree | ede0b78e704eab92cb1d0fb86e9c35dfd1c5d849 | |
| parent | 8348aca118311b82f632781b19230471fae56d4a (diff) | |
| download | redot-engine-33a7fae1275ed17b6799c5bee5dfdb538ec9b8fe.tar.gz | |
Allow *= operator between vec and mat types in shaders
| -rw-r--r-- | servers/visual/shader_language.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/servers/visual/shader_language.cpp b/servers/visual/shader_language.cpp index 50e45963d9..1acec7ccaf 100644 --- a/servers/visual/shader_language.cpp +++ b/servers/visual/shader_language.cpp @@ -1215,6 +1215,15 @@ bool ShaderLanguage::_validate_operator(OperatorNode *p_op, DataType *r_ret_type } else if (p_op->op == OP_ASSIGN_MUL && na == TYPE_MAT4 && nb == TYPE_VEC4) { valid = true; ret_type = TYPE_MAT4; + } else if (p_op->op == OP_ASSIGN_MUL && na == TYPE_VEC2 && nb == TYPE_MAT2) { + valid = true; + ret_type = TYPE_VEC2; + } else if (p_op->op == OP_ASSIGN_MUL && na == TYPE_VEC3 && nb == TYPE_MAT3) { + valid = true; + ret_type = TYPE_VEC3; + } else if (p_op->op == OP_ASSIGN_MUL && na == TYPE_VEC4 && nb == TYPE_MAT4) { + valid = true; + ret_type = TYPE_VEC4; } } break; case OP_ASSIGN_BIT_AND: |