godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-16 14:00:40 +00:00
Code Releases Wiki Activity

[3.2] Prevents default values of VSNodeCustom from overriding by a script

Browse Source 
(cherry picked from commit ac91e2ca0d)
This commit is contained in:
Yuri Roubinsky
2021-04-12 13:29:44 +03:00
committed by Rémi Verschelde
parent 9201ffa9a2
commit 7a6a150bc2
3 changed files with 54 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
editor/plugins/visual_shader_editor_plugin.cpp
View File

@@ -552,6 +552,11 @@ void VisualShaderEditor::_update_graph() {
bool is_group = !group_node.is_null();
Size2 size = Size2(0, 0);
VisualShaderNodeCustom *custom = Object::cast_to<VisualShaderNodeCustom>(vsnode.ptr());
if (custom) {
custom->_set_initialized(true);
}
Ref<VisualShaderNodeExpression> expression_node = Object::cast_to<VisualShaderNodeExpression>(group_node.ptr());
bool is_expression = !expression_node.is_null();
String expression = "";
@@ -1293,10 +1298,15 @@ void VisualShaderEditor::_port_edited() {
Variant value = property_editor->get_variant();
Ref<VisualShaderNode> vsn = visual_shader->get_node(type, editing_node);
ERR_FAIL_COND(!vsn.is_valid());
undo_redo->create_action(TTR("Set Input Default Port"));
undo_redo->add_do_method(vsn.ptr(), "set_input_port_default_value", editing_port, value);
undo_redo->add_undo_method(vsn.ptr(), "set_input_port_default_value", editing_port, vsn->get_input_port_default_value(editing_port));
Ref<VisualShaderNodeCustom> custom = Object::cast_to<VisualShaderNodeCustom>(vsn.ptr());
if (custom.is_valid()) {
undo_redo->add_do_method(custom.ptr(), "_set_input_port_default_value", editing_port, value);
undo_redo->add_undo_method(custom.ptr(), "_set_input_port_default_value", editing_port, vsn->get_input_port_default_value(editing_port));
} else {
undo_redo->add_do_method(vsn.ptr(), "set_input_port_default_value", editing_port, value);
undo_redo->add_undo_method(vsn.ptr(), "set_input_port_default_value", editing_port, vsn->get_input_port_default_value(editing_port));
}
undo_redo->add_do_method(this, "_update_graph");
undo_redo->add_undo_method(this, "_update_graph");
undo_redo->commit_action();