mirror of
https://github.com/WarmUpTill/SceneSwitcher.git
synced 2026-08-29 04:36:21 -05:00
Compare commits
2 Commits
1.36.1-tes
...
nested-que
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ba7886c8c1 | ||
|
|
801268d08b |
@@ -263,6 +263,7 @@ bool MacroActionMacro::Load(obs_data_t *obj)
|
|||||||
if (obs_data_has_user_value(obj, "nestedMacro")) {
|
if (obs_data_has_user_value(obj, "nestedMacro")) {
|
||||||
OBSDataAutoRelease nestedMacroData =
|
OBSDataAutoRelease nestedMacroData =
|
||||||
obs_data_get_obj(obj, "nestedMacro");
|
obs_data_get_obj(obj, "nestedMacro");
|
||||||
|
_nestedMacro = std::make_shared<Macro>();
|
||||||
_nestedMacro->Load(nestedMacroData);
|
_nestedMacro->Load(nestedMacroData);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -309,6 +310,15 @@ void MacroActionMacro::ResolveVariablesToFixedValues()
|
|||||||
{
|
{
|
||||||
_actionIndex.ResolveVariables();
|
_actionIndex.ResolveVariables();
|
||||||
_label.ResolveVariables();
|
_label.ResolveVariables();
|
||||||
|
|
||||||
|
if (_action == Action::NESTED_MACRO) {
|
||||||
|
for (auto &action : _nestedMacro->Actions()) {
|
||||||
|
action->ResolveVariablesToFixedValues();
|
||||||
|
}
|
||||||
|
for (auto &action : _nestedMacro->ElseActions()) {
|
||||||
|
action->ResolveVariablesToFixedValues();
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void runActionsHelper(Macro *macro, bool runElseActions, bool setInputs,
|
static void runActionsHelper(Macro *macro, bool runElseActions, bool setInputs,
|
||||||
|
|||||||
Reference in New Issue
Block a user