Large scene edit optimizations (WIP)

Ryan-000 · Nov 3, 2024 · d9d23c2 · d9d23c2
1 parent 386ff93
commit d9d23c2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/editor/gui/scene_tree_editor.cpp b/editor/gui/scene_tree_editor.cpp
@@ -793,7 +793,12 @@ void SceneTreeEditor::_compute_hash(Node *p_node, uint64_t &hash) {
 	}
 
 	for (int i = 0; i < p_node->get_child_count(); i++) {
-		_compute_hash(p_node->get_child(i), hash);
+		Node *child = p_node->get_child(i);
+		// if the child is not owned, skip.
+		if (!child->get_owner()) {
+			continue;
+		}
+		_compute_hash(child, hash);
 	}
 }
 

diff --git a/editor/scene_tree_dock.cpp b/editor/scene_tree_dock.cpp
@@ -2008,6 +2008,12 @@ void SceneTreeDock::perform_node_renames(Node *p_base, HashMap<Node *, NodePath>
 		return;
 	}
 
+	// if it has no owner, but its not the root node, return early
+	if (!p_base->get_owner() && p_base != p_base->get_tree()->get_edited_scene_root()) {
+		// possibly special case for ->is_editable_instance()?
+		return;
+	}
+
 	// No renaming if base node is deleted.
 	HashMap<Node *, NodePath>::Iterator found_base_path = p_renames->find(p_base);
 	if (found_base_path && found_base_path->value.is_empty()) {