mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-04 10:40:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/getting-started-tour

Browse Source 
# Conflicts:
#	modules/skybrowser/skybrowsermodule.cpp
This commit is contained in:
Ylva Selling
2022-06-29 05:21:45 -04:00
parent 817fad60c3 4cb75f5820
commit b6e4f6dcaf
216 changed files with 1007 additions and 547 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/skybrowser/skybrowsermodule.cpp
View File

@@ -169,7 +169,7 @@ SkyBrowserModule::SkyBrowserModule()
// Set callback functions
global::callback::mouseButton->emplace(global::callback::mouseButton->begin(),
[&](MouseButton button, MouseAction action, KeyModifier) -> bool {
[&](MouseButton, MouseAction action, KeyModifier) -> bool {
if (action == MouseAction::Press) {
_cameraRotation.stop();
}