summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2017-07-23 13:09:12 +0200
committerGitHub <noreply@github.com>2017-07-23 13:09:12 +0200
commit5fbe4c130ddc851b4fa116d6b462e3fc00b36e9c (patch)
treebfe598923d9fb0e4ed9b95ccef8cae53df30105b /modules
parentc6691076263aad2ddffb9b0b4c3c2a00a93a2070 (diff)
parenteffceee6ea3b1bcc185897b96cc30fb8d08e9599 (diff)
Merge pull request #9758 from vnen/fix-vs-return
VS: Fix return value for user-defined functions
Diffstat (limited to 'modules')
-rw-r--r--modules/visual_script/visual_script_flow_control.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/visual_script/visual_script_flow_control.cpp b/modules/visual_script/visual_script_flow_control.cpp
index 7074ac76c7..77f3111d94 100644
--- a/modules/visual_script/visual_script_flow_control.cpp
+++ b/modules/visual_script/visual_script_flow_control.cpp
@@ -29,9 +29,9 @@
/*************************************************************************/
#include "visual_script_flow_control.h"
-#include "project_settings.h"
#include "io/resource_loader.h"
#include "os/keyboard.h"
+#include "project_settings.h"
//////////////////////////////////////////
////////////////RETURN////////////////////
@@ -138,11 +138,11 @@ public:
if (with_value) {
*p_working_mem = *p_inputs[0];
+ return STEP_EXIT_FUNCTION_BIT;
} else {
*p_working_mem = Variant();
+ return 0;
}
-
- return 0;
}
};