Several all around fixes to visual scripting (in the process of creating demos)

1 files changed, 6 insertions, 7 deletions

diff --git a/modules/visual_script/visual_script_func_nodes.h b/modules/visual_script/visual_script_func_nodes.h
index 9d2c26faf0..f958da8222 100644
--- a/modules/visual_script/visual_script_func_nodes.h
+++ b/modules/visual_script/visual_script_func_nodes.h
@@ -13,6 +13,7 @@ public:
 		CALL_MODE_NODE_PATH,
 		CALL_MODE_INSTANCE,
 		CALL_MODE_BASIC_TYPE,
+		CALL_MODE_SINGLETON,
 	};
 
 	enum RPCCallMode {
@@ -33,6 +34,7 @@ private:
 	StringName function;
 	int use_default_args;
 	RPCCallMode rpc_call_mode;
+	StringName singleton;
 
 
 	Node *_get_base_node() const;
@@ -78,12 +80,16 @@ public:
 	void set_base_script(const String& p_path);
 	String get_base_script() const;
 
+	void set_singleton(const StringName& p_type);
+	StringName get_singleton() const;
+
 	void set_function(const StringName& p_type);
 	StringName get_function() const;
 
 	void set_base_path(const NodePath& p_type);
 	NodePath get_base_path() const;
 
+
 	void set_call_mode(CallMode p_mode);
 	CallMode get_call_mode() const;
 
@@ -124,8 +130,6 @@ private:
 	String base_script;
 	NodePath base_path;
 	StringName property;
-	bool use_builtin_value;
-	Variant builtin_value;
 	InputEvent::Type event_type;
 
 	Node *_get_base_node() const;
@@ -185,11 +189,6 @@ public:
 	void set_call_mode(CallMode p_mode);
 	CallMode get_call_mode() const;
 
-	void set_use_builtin_value(bool p_use);
-	bool is_using_builtin_value() const;
-
-	void set_builtin_value(const Variant &p_value);
-	Variant get_builtin_value() const;
 
 	virtual VisualScriptNodeInstance* instance(VisualScriptInstance* p_instance);