diff options
author | RĂ©mi Verschelde <remi@verschelde.fr> | 2021-10-29 15:43:36 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-10-29 15:43:36 +0200 |
commit | b71270e6eaed5f86f5b44a9238b86d9b6a606b76 (patch) | |
tree | 044a6bf4c53b1d36cc93ac7d59c6826f20753a15 /servers/rendering/renderer_rd/renderer_scene_render_rd.cpp | |
parent | 07cad9172228fc5e3e5620f3a3210e0bbfd9346c (diff) | |
parent | a6ddfecc9f1ec02cc407fb4d1bc87514b9858c4f (diff) |
Merge pull request #54376 from Chaosus/fix_converted_fogmaterial_crash
Diffstat (limited to 'servers/rendering/renderer_rd/renderer_scene_render_rd.cpp')
-rw-r--r-- | servers/rendering/renderer_rd/renderer_scene_render_rd.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/servers/rendering/renderer_rd/renderer_scene_render_rd.cpp b/servers/rendering/renderer_rd/renderer_scene_render_rd.cpp index 0db1722f33..3d8ae4c944 100644 --- a/servers/rendering/renderer_rd/renderer_scene_render_rd.cpp +++ b/servers/rendering/renderer_rd/renderer_scene_render_rd.cpp @@ -3589,7 +3589,7 @@ void RendererSceneRenderRD::FogShaderData::get_instance_param_list(List<Renderer p.info = ShaderLanguage::uniform_to_property_info(E->get()); p.info.name = E->key(); //supply name p.index = E->get().instance_index; - p.default_value = ShaderLanguage::constant_value_to_variant(E->get().default_value, E->get().type, E->get().hint); + p.default_value = ShaderLanguage::constant_value_to_variant(E->get().default_value, E->get().type, E->get().array_size, E->get().hint); p_param_list->push_back(p); } } @@ -3614,7 +3614,7 @@ Variant RendererSceneRenderRD::FogShaderData::get_default_parameter(const String if (uniforms.has(p_parameter)) { ShaderLanguage::ShaderNode::Uniform uniform = uniforms[p_parameter]; Vector<ShaderLanguage::ConstantNode::Value> default_value = uniform.default_value; - return ShaderLanguage::constant_value_to_variant(default_value, uniform.type, uniform.hint); + return ShaderLanguage::constant_value_to_variant(default_value, uniform.type, uniform.array_size, uniform.hint); } return Variant(); } |