diff options
author | Juan Linietsky <reduzio@gmail.com> | 2018-09-13 18:12:58 -0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-13 18:12:58 -0300 |
commit | 909c06ee0f0ab5feced1c9c99a725f7a423ff9f8 (patch) | |
tree | cc86065674317ca4042639b28d01260152cfd97b /drivers/gles2/rasterizer_storage_gles2.cpp | |
parent | 06c8b5a4ffb0ab6787edf071463f17df522b3e79 (diff) | |
parent | 3cedec5f754b08d04095d5ebe0cd9532de011268 (diff) |
Merge pull request #21806 from JFonS/inspector_uniform_defaults
Set uniform default values in inspector
Diffstat (limited to 'drivers/gles2/rasterizer_storage_gles2.cpp')
-rw-r--r-- | drivers/gles2/rasterizer_storage_gles2.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/drivers/gles2/rasterizer_storage_gles2.cpp b/drivers/gles2/rasterizer_storage_gles2.cpp index fdc110be9e..d945132dc2 100644 --- a/drivers/gles2/rasterizer_storage_gles2.cpp +++ b/drivers/gles2/rasterizer_storage_gles2.cpp @@ -1419,6 +1419,19 @@ Variant RasterizerStorageGLES2::material_get_param(RID p_material, const StringN return material->params[p_param]; } + return material_get_param_default(p_material, p_param); +} + +Variant RasterizerStorageGLES2::material_get_param_default(RID p_material, const StringName &p_param) const { + const Material *material = material_owner.get(p_material); + ERR_FAIL_COND_V(!material, Variant()); + + 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); + } + } return Variant(); } |