diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-11-18 12:05:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-18 12:05:02 +0100 |
| commit | 60ee61c7ff05330db383dd937da20d49f8ac4ac6 (patch) | |
| tree | ff2793e5dc18f3a5659ff3256f62388c29be6ad3 /drivers/gles2 | |
| parent | ede4decd4eceb8d63aa82bcd8b3da336e706333f (diff) | |
| parent | fb92c7b0fa7faf0f69b5da0bef3fcc2350fd832e (diff) | |
Merge pull request #23742 from JFonS/fix_23698
Use hint_color when getting shader default params
Diffstat (limited to 'drivers/gles2')
| -rw-r--r-- | drivers/gles2/rasterizer_storage_gles2.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gles2/rasterizer_storage_gles2.cpp b/drivers/gles2/rasterizer_storage_gles2.cpp index 060988fbea..d646500a23 100644 --- a/drivers/gles2/rasterizer_storage_gles2.cpp +++ b/drivers/gles2/rasterizer_storage_gles2.cpp @@ -1497,8 +1497,9 @@ Variant RasterizerStorageGLES2::material_get_param_default(RID p_material, const if (material->shader) { if (material->shader->uniforms.has(p_param)) { - Vector<ShaderLanguage::ConstantNode::Value> default_value = material->shader->uniforms[p_param].default_value; - return ShaderLanguage::constant_value_to_variant(default_value, material->shader->uniforms[p_param].type); + ShaderLanguage::ShaderNode::Uniform uniform = material->shader->uniforms[p_param]; + Vector<ShaderLanguage::ConstantNode::Value> default_value = uniform.default_value; + return ShaderLanguage::constant_value_to_variant(default_value, uniform.type, uniform.hint); } } return Variant(); |