summaryrefslogtreecommitdiff
path: root/scene/resources
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2023-02-18 13:13:54 +0100
committerJuan Linietsky <reduzio@gmail.com>2023-02-18 13:13:54 +0100
commit34fd128723e3dd4eff0f3d2aaeddd13ff5c6bcad (patch)
tree0c21adfeae606964b0264e5a5bf0561848e08b93 /scene/resources
parente9c7b8d2246bd0797af100808419c994fa43a9d2 (diff)
Fix shader parameter assign
-Make sure the remap is created properly if never assigned before. Fixes #72923. Supersedes #73066.
Diffstat (limited to 'scene/resources')
-rw-r--r--scene/resources/material.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/scene/resources/material.cpp b/scene/resources/material.cpp
index 15fe25d062..2627898f5f 100644
--- a/scene/resources/material.cpp
+++ b/scene/resources/material.cpp
@@ -369,7 +369,15 @@ void ShaderMaterial::set_shader_parameter(const StringName &p_param, const Varia
param_cache.erase(p_param);
RS::get_singleton()->material_set_param(_get_material(), p_param, Variant());
} else {
- param_cache[p_param] = p_value;
+ Variant *v = param_cache.getptr(p_param);
+ if (!v) {
+ // Never assigned, also update the remap cache.
+ remap_cache["shader_parameter/" + p_param.operator String()] = p_param;
+ param_cache.insert(p_param, p_value);
+ } else {
+ *v = p_value;
+ }
+
if (p_value.get_type() == Variant::OBJECT) {
RID tex_rid = p_value;
if (tex_rid == RID()) {