Andrew/redot-engine
1
0
Fork 0
mirror of https://github.com/Redot-Engine/redot-engine.git synced 2025-12-06 07:17:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #100235 from akien-mga/revert-97303

Browse Source 
Revert "Avoid duplicating signals from scene instances into packed scenes"
This commit is contained in:
Rémi Verschelde
2024-12-11 18:48:18 +01:00
committed by GitHub
parent 00ac17462a 2153a60425
commit c2e4ae782a
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/object/object.h
View File

@@ -572,7 +572,7 @@ public:
CONNECT_PERSIST = 2, // hint for scene to save this connection CONNECT_PERSIST = 2, // hint for scene to save this connection
CONNECT_ONE_SHOT = 4, CONNECT_ONE_SHOT = 4,
CONNECT_REFERENCE_COUNTED = 8, CONNECT_REFERENCE_COUNTED = 8,
CONNECT_INHERITED = 16, // Whether or not the connection is in an instance of a scene. CONNECT_INHERITED = 16, // Used in editor builds.
}; };
struct Connection { struct Connection {

6
scene/resources/packed_scene.cpp
View File

@@ -1060,12 +1060,6 @@ Error SceneState::_parse_connections(Node *p_owner, Node *p_node, HashMap<String
continue; continue;
} }
// Don't include signals that are from scene instances
// (they are already saved in the scenes themselves).
if (c.flags & CONNECT_INHERITED) {
continue;
}
// only connections that originate or end into main saved scene are saved // only connections that originate or end into main saved scene are saved
// everything else is discarded // everything else is discarded

3
tests/scene/test_packed_scene.h
View File

@@ -96,6 +96,8 @@ TEST_CASE("[PackedScene] Signals Preserved when Packing Scene") {
CHECK_EQ(state->get_connection_count(), 3); CHECK_EQ(state->get_connection_count(), 3);
} }
/*
// FIXME: This subcase requires GH-48064 to be fixed.
SUBCASE("Signals that should not be saved") { SUBCASE("Signals that should not be saved") {
int subscene_flags = Object::CONNECT_PERSIST | Object::CONNECT_INHERITED; int subscene_flags = Object::CONNECT_PERSIST | Object::CONNECT_INHERITED;
// subscene node to itself // subscene node to itself
@@ -115,6 +117,7 @@ TEST_CASE("[PackedScene] Signals Preserved when Packing Scene") {
Ref<SceneState> state = packed_scene->get_state(); Ref<SceneState> state = packed_scene->get_state();
CHECK_EQ(state->get_connection_count(), 0); CHECK_EQ(state->get_connection_count(), 0);
} }
*/
memdelete(main_scene_root); memdelete(main_scene_root);
} }