Showing the changes to interface/src/scripting/RenderScriptingInterface.cpp (1 of 5 files). Show all
Unified · Split
| @@ -28,14 +28,14 @@ void RenderScriptingInterface::loadSettings() { · 27 unmodified lines | ||
| 28 | 28 | _renderMethod = (_renderMethodSetting.get()); |
| 29 | 29 | _shadowsEnabled = (_shadowsEnabledSetting.get()); |
| 30 | 30 | _ambientOcclusionEnabled = (_ambientOcclusionEnabledSetting.get()); |
| 31 | − _antialiasingMode = (_antialiasingModeSetting.get()); | |
| 31 | + //_antialiasingMode = (_antialiasingModeSetting.get()); | |
| 32 | + _antialiasingMode = static_cast<AntialiasingConfig::Mode>(_antialiasingModeSetting.get()); | |
| 32 | 33 | _viewportResolutionScale = (_viewportResolutionScaleSetting.get()); |
| 33 | 34 | }); |
| 34 | 35 | forceRenderMethod((RenderMethod)_renderMethod); |
| 35 | 36 | forceShadowsEnabled(_shadowsEnabled); |
| 36 | 37 | forceAmbientOcclusionEnabled(_ambientOcclusionEnabled); |
| 37 | 38 | forceAntialiasingMode(_antialiasingMode); |
| 38 | − forceAntialiasingMode(_antialiasingMode); | |
| 39 | 39 | forceViewportResolutionScale(_viewportResolutionScale); |
| 40 | 40 | } |
| 41 | 41 | |
| @@ -134,13 +134,11 @@ void RenderScriptingInterface::setAntialiasingMode(AntialiasingConfig::Mode mode · 92 unmodified lines | ||
| 134 | 134 | |
| 135 | 135 | void RenderScriptingInterface::forceAntialiasingMode(AntialiasingConfig::Mode mode) { |
| 136 | 136 | _renderSettingLock.withWriteLock([&] { |
| 137 | − _antialiasingMode = static_cast<AntialiasingConfig::Mode>(mode); | |
| 138 | − _antialiasingModeSetting.set(mode); | |
| 137 | + _antialiasingMode = mode; | |
| 139 | 138 | |
| 140 | 139 | auto mainViewJitterCamConfig = qApp->getRenderEngine()->getConfiguration()->getConfig<JitterSample>("RenderMainView.JitterCam"); |
| 141 | 140 | auto mainViewAntialiasingConfig = qApp->getRenderEngine()->getConfiguration()->getConfig<Antialiasing>("RenderMainView.Antialiasing"); |
| 142 | 141 | if (mainViewJitterCamConfig && mainViewAntialiasingConfig) { |
| 143 | − Menu::getInstance()->setIsOptionChecked(MenuOption::AntiAliasing, mode); | |
| 144 | 142 | switch (mode) { |
| 145 | 143 | case AntialiasingConfig::Mode::NONE: |
| 146 | 144 | mainViewJitterCamConfig->none(); |
| @@ -156,12 +154,13 @@ void RenderScriptingInterface::forceAntialiasingMode(AntialiasingConfig::Mode mo · 9 unmodified lines | ||
| 156 | 154 | break; |
| 157 | 155 | default: |
| 158 | 156 | _antialiasingMode = AntialiasingConfig::Mode::NONE; |
| 159 | − _antialiasingModeSetting.set(AntialiasingConfig::Mode::NONE); | |
| 160 | 157 | mainViewJitterCamConfig->none(); |
| 161 | 158 | mainViewAntialiasingConfig->setDebugFXAA(false); |
| 162 | 159 | break; |
| 163 | 160 | } |
| 164 | 161 | } |
| 162 | + | |
| 163 | + _antialiasingModeSetting.set(_antialiasingMode); | |
| 165 | 164 | }); |
| 166 | 165 | } |
| 167 | 166 | |