Bläddra i källkod

Merge pull request #28375 from Chaosus/fix_vs_loopback

Disallow loopback connection in visual shaders
Yuri Roubinsky 6 år sedan
förälder
incheckning
93e7eb0ddb
2 ändrade filer med 3 tillägg och 1 borttagningar
  1. 0 1
      editor/plugins/visual_shader_editor_plugin.cpp
  2. 3 0
      scene/resources/visual_shader.cpp

+ 0 - 1
editor/plugins/visual_shader_editor_plugin.cpp

@@ -757,7 +757,6 @@ void VisualShaderEditor::_connection_request(const String &p_from, int p_from_in
 	int to = p_to.to_int();
 
 	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;
 	}
 

+ 3 - 0
scene/resources/visual_shader.cpp

@@ -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))
 		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())
 		return false;