2 files changed, 19 insertions, 35 deletions

diff --git a/editor/plugins/mesh_library_editor_plugin.cpp b/editor/plugins/mesh_library_editor_plugin.cpp
index 4a8e5d9979..4b31e99f0e 100644
--- a/editor/plugins/mesh_library_editor_plugin.cpp
+++ b/editor/plugins/mesh_library_editor_plugin.cpp
@@ -160,23 +160,23 @@ void MeshLibraryEditor::_import_scene(Node *p_scene, Ref<MeshLibrary> p_library,
 
 		p_library->set_item_shapes(id, collisions);
 
-		Ref<NavigationMesh> navmesh;
-		Transform3D navmesh_transform;
+		Ref<NavigationMesh> navigation_mesh;
+		Transform3D navigation_mesh_transform;
 		for (int j = 0; j < mi->get_child_count(); j++) {
 			Node *child2 = mi->get_child(j);
 			if (!Object::cast_to<NavigationRegion3D>(child2)) {
 				continue;
 			}
 			NavigationRegion3D *sb = Object::cast_to<NavigationRegion3D>(child2);
-			navmesh = sb->get_navigation_mesh();
-			navmesh_transform = sb->get_transform();
-			if (!navmesh.is_null()) {
+			navigation_mesh = sb->get_navigation_mesh();
+			navigation_mesh_transform = sb->get_transform();
+			if (!navigation_mesh.is_null()) {
 				break;
 			}
 		}
-		if (!navmesh.is_null()) {
-			p_library->set_item_navmesh(id, navmesh);
-			p_library->set_item_navmesh_transform(id, navmesh_transform);
+		if (!navigation_mesh.is_null()) {
+			p_library->set_item_navigation_mesh(id, navigation_mesh);
+			p_library->set_item_navigation_mesh_transform(id, navigation_mesh_transform);
 		}
 	}
 
diff --git a/editor/scene_tree_dock.cpp b/editor/scene_tree_dock.cpp
index 96688a3614..f91b571118 100644
--- a/editor/scene_tree_dock.cpp
+++ b/editor/scene_tree_dock.cpp
@@ -1965,37 +1965,21 @@ void SceneTreeDock::_script_created(Ref<Script> p_script) {
 	}
 
 	Ref<EditorUndoRedoManager> &undo_redo = EditorNode::get_undo_redo();
-	if (selected.size() == 1) {
-		Node *node = selected.front()->get();
-		Ref<Script> existing = node->get_script();
-
-		undo_redo->create_action(TTR("Attach Script"), UndoRedo::MERGE_DISABLE, node);
-		undo_redo->add_do_method(InspectorDock::get_singleton(), "store_script_properties", node);
-		undo_redo->add_undo_method(InspectorDock::get_singleton(), "store_script_properties", node);
-		undo_redo->add_do_method(node, "set_script", p_script);
-		undo_redo->add_undo_method(node, "set_script", existing);
-		undo_redo->add_do_method(InspectorDock::get_singleton(), "apply_script_properties", node);
-		undo_redo->add_undo_method(InspectorDock::get_singleton(), "apply_script_properties", node);
+	undo_redo->create_action(TTR("Attach Script"), UndoRedo::MERGE_DISABLE, selected.front()->get());
+	for (Node *E : selected) {
+		Ref<Script> existing = E->get_script();
+		undo_redo->add_do_method(InspectorDock::get_singleton(), "store_script_properties", E);
+		undo_redo->add_undo_method(InspectorDock::get_singleton(), "store_script_properties", E);
+		undo_redo->add_do_method(E, "set_script", p_script);
+		undo_redo->add_undo_method(E, "set_script", existing);
+		undo_redo->add_do_method(InspectorDock::get_singleton(), "apply_script_properties", E);
+		undo_redo->add_undo_method(InspectorDock::get_singleton(), "apply_script_properties", E);
 		undo_redo->add_do_method(this, "_update_script_button");
 		undo_redo->add_undo_method(this, "_update_script_button");
-		undo_redo->commit_action();
-	} else {
-		undo_redo->create_action(TTR("Attach Script"), UndoRedo::MERGE_DISABLE, selected.front()->get());
-		for (Node *E : selected) {
-			Ref<Script> existing = E->get_script();
-			undo_redo->add_do_method(InspectorDock::get_singleton(), "store_script_properties", E);
-			undo_redo->add_undo_method(InspectorDock::get_singleton(), "store_script_properties", E);
-			undo_redo->add_do_method(E, "set_script", p_script);
-			undo_redo->add_undo_method(E, "set_script", existing);
-			undo_redo->add_do_method(InspectorDock::get_singleton(), "apply_script_properties", E);
-			undo_redo->add_undo_method(InspectorDock::get_singleton(), "apply_script_properties", E);
-			undo_redo->add_do_method(this, "_update_script_button");
-			undo_redo->add_undo_method(this, "_update_script_button");
-		}
-		undo_redo->commit_action();
 	}
+	undo_redo->commit_action();
 
-	_push_item(p_script.operator->());
+	_push_item(p_script.ptr());
 	_update_script_button();
 }