diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-08-19 19:42:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-19 19:42:57 +0200 |
| commit | faa49c182978b3fe74e7aad65fb761c2881f009c (patch) | |
| tree | e453f3d3ef758b89c7214ff0dedf607d5bf23a05 /servers/visual | |
| parent | c9498d4c3da0ac0b107ea015cf6e554a0dd882b5 (diff) | |
| parent | 9634d74d312da34b3902ca5eadb6cdccd9ce60e3 (diff) | |
Merge pull request #21183 from Chaosus/mat_varyings
Allow matrixes in varyings
Diffstat (limited to 'servers/visual')
| -rw-r--r-- | servers/visual/shader_language.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/servers/visual/shader_language.cpp b/servers/visual/shader_language.cpp index ca50d0d049..8705033326 100644 --- a/servers/visual/shader_language.cpp +++ b/servers/visual/shader_language.cpp @@ -3875,8 +3875,8 @@ Error ShaderLanguage::_parse_shader(const Map<StringName, FunctionInfo> &p_funct return ERR_PARSE_ERROR; } - if (!uniform && (type < TYPE_FLOAT || type > TYPE_VEC4)) { - _set_error("Invalid type for varying, only float,vec2,vec3,vec4 allowed."); + if (!uniform && (type < TYPE_FLOAT || type > TYPE_MAT4)) { + _set_error("Invalid type for varying, only float,vec2,vec3,vec4,mat2,mat3,mat4 allowed."); return ERR_PARSE_ERROR; } |