Merge pull request #50413 from Chaosus/vs_cleanup_warnings
This commit is contained in:
commit
e1547798d6
modules/visual_script
@ -2836,6 +2836,20 @@ void VisualScriptEditor::_graph_connected(const String &p_from, int p_from_slot,
|
|||||||
|
|
||||||
ERR_FAIL_COND(from_seq != to_seq);
|
ERR_FAIL_COND(from_seq != to_seq);
|
||||||
|
|
||||||
|
// Checking to prevent warnings.
|
||||||
|
if (from_seq) {
|
||||||
|
if (script->has_sequence_connection(p_from.to_int(), from_port, p_to.to_int())) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
} else if (script->has_data_connection(p_from.to_int(), from_port, p_to.to_int(), to_port)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Preventing connection to itself.
|
||||||
|
if (p_from.to_int() == p_to.to_int()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
// Do all the checks here.
|
// Do all the checks here.
|
||||||
StringName func; // This the func where we store the one the nodes at the end of the resolution on having multiple nodes.
|
StringName func; // This the func where we store the one the nodes at the end of the resolution on having multiple nodes.
|
||||||
|
|
||||||
@ -2989,7 +3003,7 @@ VisualScriptNode::TypeGuess VisualScriptEditor::_guess_output_type(int p_port_ac
|
|||||||
|
|
||||||
Ref<VisualScriptNode> node = script->get_node(p_port_action_node);
|
Ref<VisualScriptNode> node = script->get_node(p_port_action_node);
|
||||||
|
|
||||||
if (!node.is_valid()) {
|
if (!node.is_valid() || node->get_output_value_port_count() <= p_port_action_output) {
|
||||||
return tg;
|
return tg;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -191,7 +191,10 @@ PropertyInfo VisualScriptFunction::get_input_value_port_info(int p_idx) const {
|
|||||||
}
|
}
|
||||||
|
|
||||||
PropertyInfo VisualScriptFunction::get_output_value_port_info(int p_idx) const {
|
PropertyInfo VisualScriptFunction::get_output_value_port_info(int p_idx) const {
|
||||||
ERR_FAIL_INDEX_V(p_idx, arguments.size(), PropertyInfo());
|
// Need to check it without ERR_FAIL_COND, to prevent warnings from appearing on node creation via dragging.
|
||||||
|
if (p_idx < 0 || p_idx >= arguments.size()) {
|
||||||
|
return PropertyInfo();
|
||||||
|
}
|
||||||
PropertyInfo out;
|
PropertyInfo out;
|
||||||
out.type = arguments[p_idx].type;
|
out.type = arguments[p_idx].type;
|
||||||
out.name = arguments[p_idx].name;
|
out.name = arguments[p_idx].name;
|
||||||
|
Loading…
Reference in New Issue
Block a user