godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #21183 from Chaosus/mat_varyings 

Allow matrixes in varyings
This commit is contained in:
Rémi Verschelde 2018-08-19 19:42:57 +02:00 committed by GitHub
parent c9498d4c3d 9634d74d31
commit faa49c1829
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
servers/visual/shader_language.cpp
View File

@ -3875,8 +3875,8 @@ Error ShaderLanguage::_parse_shader(const Map<StringName, FunctionInfo> &p_funct
return ERR_PARSE_ERROR; return ERR_PARSE_ERROR;
} }
if (!uniform && (type < TYPE_FLOAT || type > TYPE_VEC4)) { if (!uniform && (type < TYPE_FLOAT || type > TYPE_MAT4)) {
_set_error("Invalid type for varying, only float,vec2,vec3,vec4 allowed."); _set_error("Invalid type for varying, only float,vec2,vec3,vec4,mat2,mat3,mat4 allowed.");
return ERR_PARSE_ERROR; return ERR_PARSE_ERROR;
} }