mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-24 21:39:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into issue/2403

Browse Source 
# Conflicts:
#	ext/ghoul
This commit is contained in:
Ylva Selling
2023-02-02 16:39:29 -05:00
parent b7ca19dff7 d7eec159fc
commit 938ae6ffe1
375 changed files with 4469 additions and 3035 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/skybrowser/skybrowsermodule.cpp
+1 -1
View File
@@ -237,7 +237,7 @@ SkyBrowserModule::SkyBrowserModule()
void SkyBrowserModule::internalInitialize(const ghoul::Dictionary& dict) {
const Parameters p = codegen::bake<Parameters>(dict);
_enabled = p.enabled.value_or(true);
_enabled = p.enabled.value_or(_enabled);
_allowCameraRotation = p.allowCameraRotation.value_or(_allowCameraRotation);
_cameraRotationSpeed = p.cameraRotSpeed.value_or(_cameraRotationSpeed);
_targetAnimationSpeed = p.targetSpeed.value_or(_targetAnimationSpeed);