Merge pull request #70223 from KoBeWi/condition_of_arguable_usefulness

Remove unnecessary condition
godotengine · Dec 17, 2022 · f4eac63 · f4eac63
2 parents 5d2137a + 0f5018b
commit f4eac63
Showing 1 changed file with 11 additions and 27 deletions.
diff --git 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();
 }