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

Merge pull request #40600 from akien-mga/vs-duplicate-branches-warning 

VisualScript: Fix -Wduplicate-branches warning
This commit is contained in:
Rémi Verschelde 2020-07-22 17:29:22 +02:00 committed by GitHub
parent 938e2e966f 9a586defed
commit 0cd98ec7e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/visual_script/visual_script.cpp
View File

@ -36,8 +36,6 @@
#include "scene/main/node.h" #include "scene/main/node.h"
#include "visual_script_nodes.h" #include "visual_script_nodes.h"
#include <stdint.h>
//used by editor, this is not really saved //used by editor, this is not really saved
void VisualScriptNode::set_breakpoint(bool p_breakpoint) { void VisualScriptNode::set_breakpoint(bool p_breakpoint) {
breakpoint = p_breakpoint; breakpoint = p_breakpoint;
@ -1764,11 +1762,7 @@ Variant VisualScriptInstance::_call_internal(const StringName &p_method, void *p
} }
next = node->sequence_outputs[output]; next = node->sequence_outputs[output];
if (next) { VSDEBUG("GOT NEXT NODE - " + (next ? itos(next->get_id()) : "NULL"));
VSDEBUG("GOT NEXT NODE - " + itos(next->get_id()));
} else {
VSDEBUG("GOT NEXT NODE - NULL");
}
} }
if (flow_stack) { if (flow_stack) {