Fix unable to disconnect signal in Editor once created #69661
Conversation
Mickeon
force-pushed
the
fix-editor-cannot-disconnect-signal
branch
from
740fb70 to
37a0a76
Compare
|
Seems like this PR makes it possible to disconnect foreign connections again... |
|
Alright, back to work. |
Mickeon
force-pushed
the
fix-editor-cannot-disconnect-signal
branch
from
37a0a76 to
0b9ce00
Compare
Mickeon
force-pushed
the
fix-editor-cannot-disconnect-signal
branch
2 times, most recently
from
ab132b4 to
ea93098
Compare
Mickeon
force-pushed
the
fix-editor-cannot-disconnect-signal
branch
from
ea93098 to
f08cfaa
Compare
| @@ -450,7 +450,11 @@ Node *SceneState::instantiate(GenEditState p_edit_state) const { | |||
| callable = callable.bindp(argptrs, binds.size()); | |||
| } | |||
|
|
|||
| #ifdef TOOLS_ENABLED | |||
| cfrom->connect(snames[c.signal], callable, CONNECT_PERSIST | c.flags | (p_edit_state == GEN_EDIT_STATE_MAIN ? 0 : CONNECT_INHERITED)); | |||
There was a problem hiding this comment.
Couldn't this possibly be useful at runtime too?
There was a problem hiding this comment.
It could be useful if someone uses custom scene serialization, but it's rather corner-case.
scene/resources/packed_scene.cpp
Outdated
| @@ -450,7 +450,11 @@ Node *SceneState::instantiate(GenEditState p_edit_state) const { | |||
| callable = callable.bindp(argptrs, binds.size()); | |||
| } | |||
|
|
|||
| #ifdef TOOLS_ENABLED | |||
There was a problem hiding this comment.
Would remove this ifdef too, probably not worth it
There was a problem hiding this comment.
just to clarify, PERSIST is also editor only, so no point of having one with ifdef and the other without.
There was a problem hiding this comment.
I don't know... CONNECT_PERSIST can technically also be used in release builds when building PackedScenes at run-time
Adds a CONNECT_INHERITED flag to connections, only available in editor builds. This flag denotes that the signal has been inherited from a previous Scene in the instancing hierarchy.
Mickeon
force-pushed
the
fix-editor-cannot-disconnect-signal
branch
from
f08cfaa to
885f2a4
Compare
|
Thanks! |
|
Seems like discarding instancing (using the Make Local option) doesn't remove the flag and the connections cannot be disconnected at all. EDIT: |
Fixes #69348.
#66665 implementation was a bit too stupid and didn't account all cases. Most importantly, signals that had yet to be saved.
To solve this in the least chaotic, slow and intrusive way, I basically gave up. This PR adds a CONNECT_INHERITED flag to connections, only available in editor builds. This flag denotes that the signal has been inherited from a previous Scene in the instancing hierarchy. Signals deemed to be inherited cannot be edited or deleted in the editor.