summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRCurtis <rjcurtis22@gmail.com>2017-10-14 14:55:09 -0400
committerRCurtis <rjcurtis22@gmail.com>2017-10-14 14:55:09 -0400
commit7fb57ecbd9457d8d2f7cb8264e9c51530ea1967a (patch)
treeb48207b45429f00e44682792f82830f6b40bf740
parentad44b3d52233f6110970ab0cd6202484f2a12280 (diff)
Fixed issue that improperly initialized visual node properties to Nil
-rw-r--r--modules/visual_script/visual_script_builtin_funcs.cpp9
-rw-r--r--modules/visual_script/visual_script_builtin_funcs.h1
2 files changed, 7 insertions, 3 deletions
diff --git a/modules/visual_script/visual_script_builtin_funcs.cpp b/modules/visual_script/visual_script_builtin_funcs.cpp
index 972be5f5a4..c5afb2a8f5 100644
--- a/modules/visual_script/visual_script_builtin_funcs.cpp
+++ b/modules/visual_script/visual_script_builtin_funcs.cpp
@@ -1236,6 +1236,11 @@ void VisualScriptBuiltinFunc::_bind_methods() {
BIND_ENUM_CONSTANT(FUNC_MAX);
}
+VisualScriptBuiltinFunc::VisualScriptBuiltinFunc(VisualScriptBuiltinFunc::BuiltinFunc func) {
+
+ this->func = func;
+}
+
VisualScriptBuiltinFunc::VisualScriptBuiltinFunc() {
func = MATH_SIN;
@@ -1244,9 +1249,7 @@ VisualScriptBuiltinFunc::VisualScriptBuiltinFunc() {
template <VisualScriptBuiltinFunc::BuiltinFunc func>
static Ref<VisualScriptNode> create_builtin_func_node(const String &p_name) {
- Ref<VisualScriptBuiltinFunc> node;
- node.instance();
- node->set_func(func);
+ Ref<VisualScriptBuiltinFunc> node = memnew(VisualScriptBuiltinFunc(func));
return node;
}
diff --git a/modules/visual_script/visual_script_builtin_funcs.h b/modules/visual_script/visual_script_builtin_funcs.h
index 97ab307039..9e8aae1584 100644
--- a/modules/visual_script/visual_script_builtin_funcs.h
+++ b/modules/visual_script/visual_script_builtin_funcs.h
@@ -130,6 +130,7 @@ public:
virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance);
+ VisualScriptBuiltinFunc(VisualScriptBuiltinFunc::BuiltinFunc func);
VisualScriptBuiltinFunc();
};