Skip to content

Zzz rc2 #2404

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 23, 2022
Merged

Zzz rc2 #2404

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75c6e62
Fix headless crash
dcwhite Sep 6, 2022
6ea8efd
Update ViewSceneControlsDock.cc
dcwhite Sep 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/Dataflow/Engine/Controller/NetworkEditorController.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,11 @@ NetworkEditorController::NetworkEditorController(ModuleFactoryHandle mf, ModuleS
collabs_.algoFactory_ = af;
collabs_.reexFactory_ = reex;
collabs_.executorFactory_ = executorFactory;
#ifndef BUILD_HEADLESS
collabs_.executionManager_.reset(new ExecutionQueueManager);
#else
collabs_.executionManager_.reset(new SimpleExecutionManager);
#endif
collabs_.cmdFactory_ = cmdFactory;
collabs_.eventCmdFactory_ = eventCmdFactory ? eventCmdFactory : makeShared<NullCommandFactory>();
collabs_.serializationManager_ = nesm;
Expand Down
2 changes: 2 additions & 0 deletions src/Interface/Modules/Render/ViewSceneControlsDock.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -798,6 +798,8 @@ CompositeLightControls::CompositeLightControls(ViewSceneDialog* parent, const st
auto layout = new QHBoxLayout;
setLayout(layout);
layout->addWidget(tabs_);
if (!lights_.empty())
setMinimumSize(lights_[0]->minimumSize());
}

QColor LightButtonUpdater::color() const
Expand Down