asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #9758 from vnen/fix-vs-return

Browse source 
VS: Fix return value for user-defined functions
This commit is contained in:
Rémi Verschelde 2017-07-23 13:09:12 +02:00 committed by GitHub
commit 5fbe4c130d
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
modules/visual_script/visual_script_flow_control.cpp
View file

@ -29,9 +29,9 @@
/*************************************************************************/ /*************************************************************************/
#include "visual_script_flow_control.h" #include "visual_script_flow_control.h"
#include "project_settings.h"
#include "io/resource_loader.h" #include "io/resource_loader.h"
#include "os/keyboard.h" #include "os/keyboard.h"
#include "project_settings.h"
////////////////////////////////////////// //////////////////////////////////////////
////////////////RETURN//////////////////// ////////////////RETURN////////////////////
@ -138,12 +138,12 @@ public:
if (with_value) { if (with_value) {
*p_working_mem = *p_inputs[0]; *p_working_mem = *p_inputs[0];
return STEP_EXIT_FUNCTION_BIT;
} else { } else {
*p_working_mem = Variant(); *p_working_mem = Variant();
}
return 0; return 0;
} }
}
}; };
VisualScriptNodeInstance *VisualScriptReturn::instance(VisualScriptInstance *p_instance) { VisualScriptNodeInstance *VisualScriptReturn::instance(VisualScriptInstance *p_instance) {