From d763ee8398170e683e1e27cf4c000240b66b4f0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Cambr=C3=A9?= <david.cambre@gmail.com>
Date: Sat, 6 Nov 2021 12:31:50 +0100
Subject: [PATCH] VisualScript-sync-and-improve-variable-and-property

---
 .../visual_script/visual_script_editor.cpp    | 27 +++++++++++--------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/modules/visual_script/visual_script_editor.cpp b/modules/visual_script/visual_script_editor.cpp
index 49ae79e22a..7b4fbc67fc 100644
--- a/modules/visual_script/visual_script_editor.cpp
+++ b/modules/visual_script/visual_script_editor.cpp
@@ -2195,20 +2195,20 @@ void VisualScriptEditor::drop_data_fw(const Point2 &p_point, const Variant &p_da
 
 		Ref<VisualScriptNode> vnode;
 		if (use_set) {
-			Ref<VisualScriptVariableSet> vnodes;
-			vnodes.instantiate();
-			vnodes->set_variable(d["variable"]);
-			vnode = vnodes;
+			Ref<VisualScriptPropertySet> pset;
+			pset.instantiate();
+			vnode = pset;
 		} else {
-			Ref<VisualScriptVariableGet> vnodeg;
-			vnodeg.instantiate();
-			vnodeg->set_variable(d["variable"]);
-			vnode = vnodeg;
+			Ref<VisualScriptPropertyGet> pget;
+			pget.instantiate();
+			vnode = pget;
 		}
 
 		int new_id = script->get_available_id();
-
 		undo_redo->create_action(TTR("Add Node"));
+		undo_redo->add_do_method(vnode.ptr(), "set_property", d["variable"]);
+		undo_redo->add_do_method(vnode.ptr(), "set_base_script", script->get_path());
+
 		undo_redo->add_do_method(script.ptr(), "add_node", new_id, vnode, pos);
 		undo_redo->add_undo_method(script.ptr(), "remove_node", new_id);
 		undo_redo->add_do_method(this, "_update_graph");
@@ -2451,12 +2451,14 @@ void VisualScriptEditor::drop_data_fw(const Point2 &p_point, const Variant &p_da
 				pget.instantiate();
 				pget->set_call_mode(VisualScriptPropertyGet::CALL_MODE_INSTANCE);
 				pget->set_base_type(obj->get_class());
-
 				vnode = pget;
 			}
 
 			undo_redo->add_do_method(script.ptr(), "add_node", base_id, vnode, pos);
 			undo_redo->add_do_method(vnode.ptr(), "set_property", d["property"]);
+			if (!obj->get_script().is_null()) {
+				undo_redo->add_do_method(vnode.ptr(), "set_base_script", Ref<Script>(obj->get_script())->get_path());
+			}
 			if (!use_get) {
 				undo_redo->add_do_method(vnode.ptr(), "set_default_input_value", 0, d["value"]);
 			}
@@ -2487,7 +2489,6 @@ void VisualScriptEditor::drop_data_fw(const Point2 &p_point, const Variant &p_da
 					pset->set_call_mode(VisualScriptPropertySet::CALL_MODE_NODE_PATH);
 					pset->set_base_path(sn->get_path_to(node));
 				}
-
 				vnode = pset;
 			} else {
 				Ref<VisualScriptPropertyGet> pget;
@@ -2502,9 +2503,13 @@ void VisualScriptEditor::drop_data_fw(const Point2 &p_point, const Variant &p_da
 			}
 			undo_redo->add_do_method(script.ptr(), "add_node", base_id, vnode, pos);
 			undo_redo->add_do_method(vnode.ptr(), "set_property", d["property"]);
+			if (!obj->get_script().is_null()) {
+				undo_redo->add_do_method(vnode.ptr(), "set_base_script", Ref<Script>(obj->get_script())->get_path());
+			}
 			if (!use_get) {
 				undo_redo->add_do_method(vnode.ptr(), "set_default_input_value", 0, d["value"]);
 			}
+
 			undo_redo->add_undo_method(script.ptr(), "remove_node", base_id);
 
 			undo_redo->add_do_method(this, "_update_graph");