diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-12-09 07:34:29 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-09 07:34:29 +0100 |
| commit | 2d02cb67ee904b7614a6a5396669c575193fb73f (patch) | |
| tree | f4fe45b7e7572b812331330b3a4ca8b4a8f22760 /scene/resources | |
| parent | 36763f65e6b56b11f1f3e96ed7103304cce76532 (diff) | |
| parent | 885f2a4eca0f348e8d04e45e6e9a0e950f4c6964 (diff) | |
Merge pull request #69661 from Mickeon/fix-editor-cannot-disconnect-signal
Fix unable to disconnect signal in Editor once created
Diffstat (limited to 'scene/resources')
| -rw-r--r-- | scene/resources/packed_scene.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/resources/packed_scene.cpp b/scene/resources/packed_scene.cpp index f4b7f3d0b2..5316b524ba 100644 --- a/scene/resources/packed_scene.cpp +++ b/scene/resources/packed_scene.cpp @@ -450,7 +450,7 @@ Node *SceneState::instantiate(GenEditState p_edit_state) const { callable = callable.bindp(argptrs, binds.size()); } - cfrom->connect(snames[c.signal], callable, CONNECT_PERSIST | c.flags); + cfrom->connect(snames[c.signal], callable, CONNECT_PERSIST | c.flags | (p_edit_state == GEN_EDIT_STATE_MAIN ? 0 : CONNECT_INHERITED)); } //Node *s = ret_nodes[0]; |