Fixed 'Change Type' ignoring non-top-level nodes and editing foreign nodes/ being available when it is not.

Author: EdwardChanCH

editor/docks/scene_tree_dock.cpp

@@ -800,11 +800,13 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) {
 				break;
 			}
 
-			if (!_validate_no_foreign()) {
+			List<Node *> full_selection = editor_selection->get_full_selected_node_list();
+
+			if (!_validate_no_foreign_selected(full_selection)) {
 				break;
 			}
 
-			if (!_validate_no_instance()) {
+			if (!_validate_no_instance_selected(full_selection)) {
 				break;
 			}
 
@@ -2402,9 +2404,12 @@ void SceneTreeDock::_node_prerenamed(Node *p_node, const String &p_new_name) {
 }
 
 bool SceneTreeDock::_validate_no_foreign() {
-	const List<Node *> selection = editor_selection->get_top_selected_node_list();
+	// Deprecated (see PR #119617).
+	return _validate_no_foreign_selected(editor_selection->get_top_selected_node_list());
+}
 
-	for (Node *E : selection) {
+bool SceneTreeDock::_validate_no_foreign_selected(const List<Node *> &p_selected) {
+	for (Node *E : p_selected) {
 		if (E != edited_scene && E->get_owner() != edited_scene) {
 			accept->set_text(TTR("Can't operate on nodes from a foreign scene!"));
 			accept->popup_centered();
@@ -2431,9 +2436,12 @@ bool SceneTreeDock::_validate_no_foreign() {
 }
 
 bool SceneTreeDock::_validate_no_instance() {
-	const List<Node *> selection = editor_selection->get_top_selected_node_list();
+	// Deprecated (see PR #119617).
+	return _validate_no_instance_selected(editor_selection->get_top_selected_node_list());
+}
 
-	for (Node *E : selection) {
+bool SceneTreeDock::_validate_no_instance_selected(const List<Node *> &p_selected) {
+	for (Node *E : p_selected) {
 		if (E != edited_scene && E->is_instance()) {
 			accept->set_text(TTR("This operation can't be done on instantiated scenes."));
 			accept->popup_centered();
@@ -3127,7 +3135,8 @@ void SceneTreeDock::_create() {
 		_do_create(parent);
 
 	} else if (current_option == TOOL_CHANGE_TYPE) {
-		const List<Node *> selection = editor_selection->get_top_selected_node_list();
+		// TODO: Rename selection to full_selection?
+		const List<Node *> selection = editor_selection->get_full_selected_node_list();
 		ERR_FAIL_COND(selection.is_empty());
 
 		EditorUndoRedoManager *ur = EditorUndoRedoManager::get_singleton();
@@ -3860,8 +3869,13 @@ void SceneTreeDock::_tree_rmb(const Vector2 &p_menu_pos) {
 	ERR_FAIL_COND(!EditorNode::get_singleton()->get_edited_scene());
 	menu->clear(false);
 
+	// TODO: Rename selection to top_selection?
+	// Returns only the top-level selected nodes (i.e. excludes any selected node whose parent is also selected).
+	// The first node selected by the user is at the front of the list (i.e. not sorted in scene tree order).
 	const List<Node *> selection = editor_selection->get_top_selected_node_list();
-	List<Node *> full_selection = editor_selection->get_full_selected_node_list(); // Above method only returns nodes with common parent.
+	// Returns all selected nodes (list version of "get_selected_nodes").
+	// The first node selected by the user is at the front of the list (i.e. not sorted in scene tree order).
+	List<Node *> full_selection = editor_selection->get_full_selected_node_list();
 
 	scene_tree->get_scene_tree()->grab_focus(true);
 
@@ -3938,7 +3952,7 @@ void SceneTreeDock::_tree_rmb(const Vector2 &p_menu_pos) {
 	bool can_replace = true;
 
 	if (profile_allow_editing) {
-		for (Node *E : selection) {
+		for (Node *E : full_selection) {
 			if (E != edited_scene && (E->get_owner() != edited_scene || E->is_instance())) {
 				can_replace = false;
 				if (!E->is_instance()) {

editor/docks/scene_tree_dock.h

@@ -252,8 +252,12 @@ class SceneTreeDock : public EditorDock {
 	void _new_scene_from(const String &p_file);
 	void _set_node_owner_recursive(Node *p_node, Node *p_owner, const HashMap<const Node *, Node *> &p_inverse_duplimap);
 
+	//[[deprecated("Use _validate_no_foreign_selected() instead (see PR #119617).")]]
 	bool _validate_no_foreign();
+	bool _validate_no_foreign_selected(const List<Node *> &p_selected);
+	//[[deprecated("Use _validate_no_instance_selected() instead (see PR #119617).")]]
 	bool _validate_no_instance();
+	bool _validate_no_instance_selected(const List<Node *> &p_selected);
 	void _selection_changed();
 	void _update_script_button();
 	void _queue_update_script_button();