summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Marques <george@gmarqu.es>2017-07-21 00:05:56 -0300
committerGeorge Marques <george@gmarqu.es>2017-07-21 00:05:56 -0300
commit3fdf8663f7979c073cf81b97dcae4105c411fe15 (patch)
treea6cae21d72bb423a88cf97414ba6593f3f1c59f0
parent2a0c0db028c84c75f4a927d0fd400449f3236952 (diff)
Fix issues with custom nodes in visual script
- Doesn't crash anymore. - Inputs are properly transferred.
-rw-r--r--modules/visual_script/visual_script_nodes.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/modules/visual_script/visual_script_nodes.cpp b/modules/visual_script/visual_script_nodes.cpp
index 9cbadde521..f04488cf12 100644
--- a/modules/visual_script/visual_script_nodes.cpp
+++ b/modules/visual_script/visual_script_nodes.cpp
@@ -29,10 +29,10 @@
/*************************************************************************/
#include "visual_script_nodes.h"
-#include "project_settings.h"
#include "global_constants.h"
#include "os/input.h"
#include "os/os.h"
+#include "project_settings.h"
#include "scene/main/node.h"
#include "scene/main/scene_tree.h"
@@ -2596,10 +2596,10 @@ public:
in_values.resize(in_count);
for (int i = 0; i < in_count; i++) {
- in_values[i] = p_inputs[i];
+ in_values[i] = *p_inputs[i];
}
- out_values.resize(in_count);
+ out_values.resize(out_count);
work_mem.resize(work_mem_size);
@@ -2645,6 +2645,7 @@ VisualScriptNodeInstance *VisualScriptCustomNode::instance(VisualScriptInstance
VisualScriptNodeInstanceCustomNode *instance = memnew(VisualScriptNodeInstanceCustomNode);
instance->instance = p_instance;
+ instance->node = this;
instance->in_count = get_input_value_port_count();
instance->out_count = get_output_value_port_count();