From bbb72293924e98d6fc7778f7baf5fe0da1910e10 Mon Sep 17 00:00:00 2001 From: Zach Pomerantz Date: Tue, 13 Dec 2016 20:47:28 -0500 Subject: [PATCH] skip graphics config if not in engine --- interface/src/ui/PreferencesDialog.cpp | 33 +++++++++++++------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/interface/src/ui/PreferencesDialog.cpp b/interface/src/ui/PreferencesDialog.cpp index 2c6440094b..a4cb62cc13 100644 --- a/interface/src/ui/PreferencesDialog.cpp +++ b/interface/src/ui/PreferencesDialog.cpp @@ -292,23 +292,24 @@ void setupPreferences() { { static const QString RENDER("Graphics"); auto renderConfig = qApp->getRenderEngine()->getConfiguration(); + if (renderConfig) { + auto ambientOcclusionConfig = renderConfig->getConfig(); + if (ambientOcclusionConfig) { + auto getter = [ambientOcclusionConfig]()->QString { return ambientOcclusionConfig->getPreset(); }; + auto setter = [ambientOcclusionConfig](QString preset) { ambientOcclusionConfig->setPreset(preset); }; + auto preference = new ComboBoxPreference(RENDER, "Ambient occlusion", getter, setter); + preference->setItems(ambientOcclusionConfig->getPresetList()); + preferences->addPreference(preference); + } - auto ambientOcclusionConfig = renderConfig->getConfig(); - { - auto getter = [ambientOcclusionConfig]()->QString { return ambientOcclusionConfig->getPreset(); }; - auto setter = [ambientOcclusionConfig](QString preset) { ambientOcclusionConfig->setPreset(preset); }; - auto preference = new ComboBoxPreference(RENDER, "Ambient occlusion", getter, setter); - preference->setItems(ambientOcclusionConfig->getPresetList()); - preferences->addPreference(preference); - } - - auto shadowConfig = renderConfig->getConfig(); - { - auto getter = [shadowConfig]()->QString { return shadowConfig->getPreset(); }; - auto setter = [shadowConfig](QString preset) { shadowConfig->setPreset(preset); }; - auto preference = new ComboBoxPreference(RENDER, "Shadows", getter, setter); - preference->setItems(shadowConfig->getPresetList()); - preferences->addPreference(preference); + auto shadowConfig = renderConfig->getConfig(); + if (shadowConfig) { + auto getter = [shadowConfig]()->QString { return shadowConfig->getPreset(); }; + auto setter = [shadowConfig](QString preset) { shadowConfig->setPreset(preset); }; + auto preference = new ComboBoxPreference(RENDER, "Shadows", getter, setter); + preference->setItems(shadowConfig->getPresetList()); + preferences->addPreference(preference); + } } } {