4aiman/obs-studio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libobs: Remove group_sceneitem from obs_scene struct

Browse source 
(This commit also modifies UI)

Removes obs_scene::group_sceneitem and replaces it with
obs_scene::is_group.  Changes a number of other functions related to
groups so that a group is not inherently tied to a specific scene, and
helps allow a single group to be referenced in multiple scenes if
desired.
This commit is contained in:
jp9000 2018-07-15 18:18:25 -07:00
commit 35704c4c04
6 changed files with 95 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

2
UI/window-basic-main.cpp
View file

@ -2627,7 +2627,7 @@ void OBSBasic::DeactivateAudioSource(OBSSource source)
bool OBSBasic::QueryRemoveSource(obs_source_t *source)
{
if (obs_source_get_type(source) == OBS_SOURCE_TYPE_SCENE &&
!obs_sceneitem_group_from_source(source)) {
!obs_source_is_group(source)) {
int count = ui->scenes->count();
if (count == 1) {