mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-03 10:58:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/radec-conversion

Browse Source
This commit is contained in:
Malin Ejdbo
2021-06-17 11:19:51 +02:00
parent 660ff65baf 89fa6de0b9
commit 094ca18471
23 changed files with 271 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/openspace/engine/openspaceengine.h
View File

@@ -125,7 +125,7 @@ private:
bool _hasScheduledAssetLoading = false;
std::string _scheduledAssetPathToLoad;
glm::vec2 _mousePosition;
glm::vec2 _mousePosition = glm::vec2(0.f);
//grabs json from each module to pass to the documentation engine.
std::string _documentationJson;