diff options
| author | Yuri Roubinsky <chaosus89@gmail.com> | 2022-02-10 08:34:47 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-10 08:34:47 +0300 |
| commit | 5d536f06c2e7818ca2898a16f36f366087ef2521 (patch) | |
| tree | dc4968da08a2b1dd7281ea073319118555a3862d /servers/rendering/shader_language.cpp | |
| parent | 6ad0ca8fcd08a5414788fdefc428d92b3f4a67a9 (diff) | |
| parent | 2e2c9a27b67837e34759b8da775b69a26dce2b4c (diff) | |
Merge pull request #57875 from ZuBsPaCe/shader-instance-qualifier-format-string
Diffstat (limited to 'servers/rendering/shader_language.cpp')
| -rw-r--r-- | servers/rendering/shader_language.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/servers/rendering/shader_language.cpp b/servers/rendering/shader_language.cpp index ead196b7dd..91201b2028 100644 --- a/servers/rendering/shader_language.cpp +++ b/servers/rendering/shader_language.cpp @@ -7871,7 +7871,7 @@ Error ShaderLanguage::_parse_shader(const Map<StringName, FunctionInfo> &p_funct if (is_sampler_type(type)) { if (uniform_scope == ShaderNode::Uniform::SCOPE_INSTANCE) { - _set_error(vformat(RTR("Uniforms with '%s' qualifiers can't be of sampler type.", "instance"))); + _set_error(vformat(RTR("The '%s' qualifier is not supported for sampler types."), "SCOPE_INSTANCE")); return ERR_PARSE_ERROR; } uniform2.texture_order = texture_uniforms++; @@ -7887,7 +7887,7 @@ Error ShaderLanguage::_parse_shader(const Map<StringName, FunctionInfo> &p_funct } } else { if (uniform_scope == ShaderNode::Uniform::SCOPE_INSTANCE && (type == TYPE_MAT2 || type == TYPE_MAT3 || type == TYPE_MAT4)) { - _set_error(vformat(RTR("Uniforms with '%s' qualifier can't be of matrix type.", "instance"))); + _set_error(vformat(RTR("The '%s' qualifier is not supported for matrix types."), "SCOPE_INSTANCE")); return ERR_PARSE_ERROR; } uniform2.texture_order = -1; |