Merge pull request #2404 from SCIInstitute/zzz-rc2

Zzz rc2

Author: dcwhite

src/Dataflow/Engine/Controller/NetworkEditorController.cc

@@ -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;

src/Interface/Modules/Render/ViewSceneControlsDock.cc

@@ -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