godotengine
/
godot
mirror of https://github.com/godotengine/godot
1
0
Fork 0
Code

Merge 5c2d3831e2 into 15ff450680

This commit is contained in:
Tomasz Chabora 2025-02-28 12:10:14 +00:00 committed by GitHub
parent 15ff450680 5c2d3831e2
commit c6d1e875d7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
scene/main/node.cpp
View File

@ -331,7 +331,7 @@ void Node::_propagate_enter_tree() {
data.blocked--;
#ifdef DEBUG_ENABLED
SceneDebugger::add_to_cache(data.scene_file_path, this);
SceneDebugger::add_to_cache(get_scene_file_path(), this);
#endif
// enter groups
}
@ -371,9 +371,9 @@ void Node::_propagate_exit_tree() {
//block while removing children
#ifdef DEBUG_ENABLED
if (!data.scene_file_path.is_empty()) {
if (data.scene_file_uid != ResourceUID::INVALID_ID) {
// Only remove if file path is set (optimization).
SceneDebugger::remove_from_cache(data.scene_file_path, this);
SceneDebugger::remove_from_cache(get_scene_file_path(), this);
}
#endif
data.blocked++;
@ -2577,12 +2577,19 @@ Ref<Tween> Node::create_tween() {
void Node::set_scene_file_path(const String &p_scene_file_path) {
ERR_THREAD_GUARD
data.scene_file_path = p_scene_file_path;
data.scene_file_uid = ResourceLoader::get_resource_uid(p_scene_file_path);
_emit_editor_state_changed();
}
String Node::get_scene_file_path() const {
return data.scene_file_path;
if (data.scene_file_uid == ResourceUID::INVALID_ID) {
return String();
}
return ResourceUID::get_singleton()->get_id_path(data.scene_file_uid);
}
ResourceUID::ID Node::get_scene_file_uid() const {
return data.scene_file_uid;
}
void Node::set_editor_description(const String &p_editor_description) {

3
scene/main/node.h
View File

@ -158,7 +158,7 @@ private:
// This Data struct is to avoid namespace pollution in derived classes.
struct Data {
String scene_file_path;
ResourceUID::ID scene_file_uid = ResourceUID::INVALID_ID;
Ref<SceneState> instance_state;
Ref<SceneState> inherited_state;
@ -552,6 +552,7 @@ public:
void set_scene_file_path(const String &p_scene_file_path);
String get_scene_file_path() const;
ResourceUID::ID get_scene_file_uid() const;
void set_editor_description(const String &p_editor_description);
String get_editor_description() const;

5
scene/resources/packed_scene.cpp
View File

@ -761,8 +761,9 @@ Error SceneState::_parse_node(Node *p_owner, Node *p_node, int p_parent_idx, Has
if (!p_node->get_scene_file_path().is_empty() && p_node->get_owner() == p_owner && instantiated_by_owner) {
if (p_node->get_scene_instance_load_placeholder()) {
//it's a placeholder, use the placeholder path
nd.instance = _vm_get_variant(p_node->get_scene_file_path(), variant_map);
// It's a placeholder, use the placeholder path.
ResourceUID::ID scene_id = p_node->get_scene_file_uid();
nd.instance = _vm_get_variant(ResourceUID::get_singleton()->id_to_text(scene_id), variant_map);
nd.instance |= FLAG_INSTANCE_IS_PLACEHOLDER;
} else {
//must instance ourselves