From e5fada9cd1c344c9499736dc4604f121a8746118 Mon Sep 17 00:00:00 2001 From: aaronp64 Date: Mon, 23 Sep 2024 10:37:32 -0400 Subject: [PATCH] Keep existing VectorCompose input values when setting vector type VisualShaderNodeVectorCompose::set_op_type would zero out input port default values for z and w when using vector 3D/4D, updated to keep values for all ports. Zeroing out z and w would cause values for 4D vectors to be lost when loading the visual shader - 3D vectors were not affected by this, since 3D is the default op type, which caused this step to be skipped during loading. However, both 3D and 4D were affected when changing the op type from the drop down in editor. For example, changing from 3D (1, 2, 3) to 4D would result in (1, 2, 0, 0), and changing from 4D (1, 2, 3, 4) to 3D would result in (1, 2, 0), losing previously set values. --- scene/resources/visual_shader_nodes.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/scene/resources/visual_shader_nodes.cpp b/scene/resources/visual_shader_nodes.cpp index 26666538af..fa4e566a19 100644 --- a/scene/resources/visual_shader_nodes.cpp +++ b/scene/resources/visual_shader_nodes.cpp @@ -4878,19 +4878,22 @@ void VisualShaderNodeVectorCompose::set_op_type(OpType p_op_type) { case OP_TYPE_VECTOR_3D: { float p1 = get_input_port_default_value(0); float p2 = get_input_port_default_value(1); + float p3 = get_input_port_default_value(2); set_input_port_default_value(0, p1); set_input_port_default_value(1, p2); - set_input_port_default_value(2, 0.0); + set_input_port_default_value(2, p3); } break; case OP_TYPE_VECTOR_4D: { float p1 = get_input_port_default_value(0); float p2 = get_input_port_default_value(1); + float p3 = get_input_port_default_value(2); + float p4 = get_input_port_default_value(3); set_input_port_default_value(0, p1); set_input_port_default_value(1, p2); - set_input_port_default_value(2, 0.0); - set_input_port_default_value(3, 0.0); + set_input_port_default_value(2, p3); + set_input_port_default_value(3, p4); } break; default: break;