Ensure key is erased in hashmap instance_shader_parameters instead of value
(cherry picked from commit 4fc7706a480ee87116768f34f4c3f839e9a6579d)
This commit is contained in:
1 parent
53a5cffdf7
commit
31e13d9f6f
2 files changed
+2
-2
No files matched your search
@@ -404,7 +404,7 @@ void GeometryInstance3D::set_instance_shader_parameter(const StringName &p_name,
|
||||
if (p_value.get_type() == Variant::NIL) {
|
||||
Variant def_value = RS::get_singleton()->instance_geometry_get_shader_parameter_default_value(get_instance(), p_name);
|
||||
RS::get_singleton()->instance_geometry_set_shader_parameter(get_instance(), p_name, def_value);
|
||||
instance_shader_parameters.erase(p_value);
|
||||
instance_shader_parameters.erase(p_name);
|
||||
} else {
|
||||
instance_shader_parameters[p_name] = p_value;
|
||||
if (p_value.get_type() == Variant::OBJECT) {
|
||||
|
||||
@@ -1326,7 +1326,7 @@ void CanvasItem::set_instance_shader_parameter(const StringName &p_name, const V
|
||||
if (p_value.get_type() == Variant::NIL) {
|
||||
Variant def_value = RS::get_singleton()->canvas_item_get_instance_shader_parameter_default_value(get_canvas_item(), p_name);
|
||||
RS::get_singleton()->canvas_item_set_instance_shader_parameter(get_canvas_item(), p_name, def_value);
|
||||
instance_shader_parameters.erase(p_value);
|
||||
instance_shader_parameters.erase(p_name);
|
||||
} else {
|
||||
instance_shader_parameters[p_name] = p_value;
|
||||
if (p_value.get_type() == Variant::OBJECT) {
|
||||
|
||||
Reference in new issue
Block a user