godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disallow loopback connection in visual scripts and visual shaders

This commit is contained in:
Chaosus 2019-04-24 08:44:48 +03:00
parent 80f91c9d36
commit 21ca9f6c7c
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
editor/plugins/visual_shader_editor_plugin.cpp
View File

@ -757,7 +757,6 @@ void VisualShaderEditor::_connection_request(const String &p_from, int p_from_in
int to = p_to.to_int(); int to = p_to.to_int();
if (!visual_shader->can_connect_nodes(type, from, p_from_index, to, p_to_index)) { if (!visual_shader->can_connect_nodes(type, from, p_from_index, to, p_to_index)) {
EditorNode::get_singleton()->show_warning(TTR("Unable to connect, port may be in use or connection may be invalid."));
return; return;
} }

3
scene/resources/visual_shader.cpp
View File

@ -240,6 +240,9 @@ bool VisualShader::can_connect_nodes(Type p_type, int p_from_node, int p_from_po
if (!g->nodes.has(p_from_node)) if (!g->nodes.has(p_from_node))
return false; return false;
if (p_from_node == p_to_node)
return false;
if (p_from_port < 0 || p_from_port >= g->nodes[p_from_node].node->get_output_port_count()) if (p_from_port < 0 || p_from_port >= g->nodes[p_from_node].node->get_output_port_count())
return false; return false;