From e55c6bfb7b850b8dc9fac565ab1ce56918ea4ec7 Mon Sep 17 00:00:00 2001 From: bitsawer Date: Tue, 25 Apr 2023 15:01:56 +0300 Subject: [PATCH] Fix ShaderMaterial uniform type changes --- scene/resources/material.cpp | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/scene/resources/material.cpp b/scene/resources/material.cpp index 3deb1ccaab9f..5e07bf0ff737 100644 --- a/scene/resources/material.cpp +++ b/scene/resources/material.cpp @@ -279,10 +279,28 @@ void ShaderMaterial::_get_property_list(List *p_list) const { groups[""][""].push_back(info); } + const bool is_uniform_cached = param_cache.has(E->get().name); + bool is_uniform_type_changing = false; + + if (is_uniform_cached) { + // Check if the uniform Variant type changed, for example vec3 to vec4. + const Variant &cached = param_cache.get(E->get().name); + is_uniform_type_changing = E->get().type != cached.get_type(); + + if (!is_uniform_type_changing && E->get().type == Variant::OBJECT && cached.get_type() == Variant::OBJECT) { + // Check if the Object class (hint string) changed, for example Texture2D sampler to Texture3D. + // Allow inheritance, for example Texture2D type sampler should also accept CompressedTexture2D. + Object *cached_obj = cached; + if (!cached_obj->is_class(E->get().hint_string)) { + is_uniform_type_changing = true; + } + } + } + PropertyInfo info = E->get(); info.name = "shader_parameter/" + info.name; - if (!param_cache.has(E->get().name)) { - // Property has never been edited, retrieve with default value. + if (!is_uniform_cached || is_uniform_type_changing) { + // Property has never been edited or its type changed, retrieve with default value. Variant default_value = RenderingServer::get_singleton()->shader_get_parameter_default(shader->get_rid(), E->get().name); param_cache.insert(E->get().name, default_value); remap_cache.insert(info.name, E->get().name);