Merge pull request #36189 from reduz/object-id-refactor

Changed logic and optimized ObjectID in ObjectDB and Variant, removed…

4 files changed, 5 insertions, 5 deletions

diff --git a/editor/plugins/animation_blend_tree_editor_plugin.cpp b/editor/plugins/animation_blend_tree_editor_plugin.cpp
index 2de224c043..a100525d10 100644
--- a/editor/plugins/animation_blend_tree_editor_plugin.cpp
+++ b/editor/plugins/animation_blend_tree_editor_plugin.cpp
@@ -312,7 +312,7 @@ void AnimationNodeBlendTreeEditor::_add_node(int p_idx) {
 		AnimationNode *an = Object::cast_to<AnimationNode>(ClassDB::instance(base_type));
 		ERR_FAIL_COND(!an);
 		anode = Ref<AnimationNode>(an);
-		anode->set_script(add_options[p_idx].script.get_ref_ptr());
+		anode->set_script(add_options[p_idx].script);
 		base_name = add_options[p_idx].name;
 	}
 
diff --git a/editor/plugins/script_editor_plugin.cpp b/editor/plugins/script_editor_plugin.cpp
index b8c1ba2e96..76312df20a 100644
--- a/editor/plugins/script_editor_plugin.cpp
+++ b/editor/plugins/script_editor_plugin.cpp
@@ -1257,7 +1257,7 @@ void ScriptEditor::_menu_option(int p_option) {
 				}
 
 				Ref<EditorScript> es = memnew(EditorScript);
-				es->set_script(scr.get_ref_ptr());
+				es->set_script(scr);
 				es->set_editor(EditorNode::get_singleton());
 
 				es->_run();
diff --git a/editor/plugins/version_control_editor_plugin.cpp b/editor/plugins/version_control_editor_plugin.cpp
index 3622ca8d61..e17e6a9d16 100644
--- a/editor/plugins/version_control_editor_plugin.cpp
+++ b/editor/plugins/version_control_editor_plugin.cpp
@@ -124,7 +124,7 @@ void VersionControlEditorPlugin::_initialize_vcs() {
 	ERR_FAIL_COND_MSG(!addon_script_instance, "Failed to create addon script instance.");
 
 	// The addon is attached as a script to the VCS interface as a proxy end-point
-	vcs_interface->set_script_and_instance(script.get_ref_ptr(), addon_script_instance);
+	vcs_interface->set_script_and_instance(script, addon_script_instance);
 
 	EditorVCSInterface::set_singleton(vcs_interface);
 	EditorFileSystem::get_singleton()->connect("filesystem_changed", this, "_refresh_stage_area");
diff --git a/editor/plugins/visual_shader_editor_plugin.cpp b/editor/plugins/visual_shader_editor_plugin.cpp
index d9bccc35f4..ecc140d7d2 100644
--- a/editor/plugins/visual_shader_editor_plugin.cpp
+++ b/editor/plugins/visual_shader_editor_plugin.cpp
@@ -216,7 +216,7 @@ void VisualShaderEditor::update_custom_nodes() {
 
 			Ref<VisualShaderNodeCustom> ref;
 			ref.instance();
-			ref->set_script(script.get_ref_ptr());
+			ref->set_script(script);
 
 			String name;
 			if (ref->has_method("_get_name")) {
@@ -1415,7 +1415,7 @@ VisualShaderNode *VisualShaderEditor::_add_node(int p_idx, int p_op_idx) {
 		VisualShaderNode *vsn = Object::cast_to<VisualShaderNode>(ClassDB::instance(base_type));
 		ERR_FAIL_COND_V(!vsn, NULL);
 		vsnode = Ref<VisualShaderNode>(vsn);
-		vsnode->set_script(add_options[p_idx].script.get_ref_ptr());
+		vsnode->set_script(add_options[p_idx].script);
 	}
 
 	Point2 position = graph->get_scroll_ofs();