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

Merge pull request #55981 from Chaosus/fix_shader_hint_3.x

This commit is contained in:
Rémi Verschelde 2021-12-16 10:19:48 +01:00 committed by GitHub
parent b8f87d3f86 25e24f2d05
commit c2e76dade7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
servers/visual/shader_language.cpp
View File

@ -6006,6 +6006,7 @@ Error ShaderLanguage::_parse_shader(const Map<StringName, FunctionInfo> &p_funct
} else { } else {
_set_error("Expected valid type hint after ':'."); _set_error("Expected valid type hint after ':'.");
return ERR_PARSE_ERROR;
} }
if (uniform2.hint != ShaderNode::Uniform::HINT_RANGE && uniform2.hint != ShaderNode::Uniform::HINT_NONE && uniform2.hint != ShaderNode::Uniform::HINT_COLOR && type <= TYPE_MAT4) { if (uniform2.hint != ShaderNode::Uniform::HINT_RANGE && uniform2.hint != ShaderNode::Uniform::HINT_NONE && uniform2.hint != ShaderNode::Uniform::HINT_COLOR && type <= TYPE_MAT4) {