libobs: Re-include groups in obs_enum_scenes #12556
Merged
+1
−1
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[1] changes this condition to obs_source_is_scene as a drive-by, however they aren't equivalent. obs_source_is_scene checks whether the source's is is "scene", which doesn't include groups, while OBS_SOURCE_TYPE_SCENE does. Suddenly not including groups is quite the API break. This now means obs_canvas_enum_scenes does also include groups, however that is much less of an egregious API change. [1]: 8c5858a
derrod
approved these changes
Aug 30, 2025
RytoEX
approved these changes
Sep 4, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
8c5858a changes this condition to
obs_source_is_sceneas a drive-by, however they aren't equivalent.obs_source_is_scenechecks whether the source's is is "scene", which doesn't include groups, whileOBS_SOURCE_TYPE_SCENEdoes. Suddenly not including groups is quite the API break. This now meansobs_canvas_enum_scenesdoes also include groups, however that is much less of an egregious API change.Motivation and Context
We shouldn't change API behavior on accident, for no reason, and with no announcement.
This change can manifest in scenarios where it's really hard to notice what happened. I actually found this while investigating an issue where after deleting a scene, undo would not re-add it to groups it had been nested in.
There are also these websocket issues:
Fixes #12420.
Fixes obsproject/obs-websocket#1308.
Doing a change like this would need much more consideration. And yes, I know that it already shipped in a release (31.1), but that's where these issues arose, and there are probably more.
How Has This Been Tested?
Tested with obs-raw that the websocket issue is fixed.
Tested that the undo/redo issue is fixed.
Types of changes
Checklist: