mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-27 23:39:01 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management

Browse Source
This commit is contained in:
Emil Axelsson
2017-12-19 12:56:12 +01:00
parent f5b650948e 966df322cf
commit d40d2abc9a
9 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
modules/globebrowsing/globebrowsingmodule.cpp
View File

@@ -48,6 +48,7 @@
#include <openspace/interaction/navigationhandler.h>
#include <openspace/util/factorymanager.h>
#include <ghoul/filesystem/filesystem.h>
#include <ghoul/misc/templatefactory.h>
#include <ghoul/misc/assert.h>
#include <ghoul/systemcapabilities/generalcapabilitiescomponent.h>
@@ -306,7 +307,7 @@ scripting::LuaLibrary GlobeBrowsingModule::luaLibrary() const {
#endif // GLOBEBROWSING_USE_GDAL
},
{
"${MODULE_GLOBEBROWSING}/scripts/layer_support.lua"
absPath("${MODULE_GLOBEBROWSING}/scripts/layer_support.lua")
},
{
// Documentation