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

Merge branch 'master' into feature/profiles

Browse Source 
# Conflicts:
#	include/openspace/scene/assetloader.h
#	src/scene/assetloader.cpp
This commit is contained in:
Alexander Bock
2020-06-14 17:54:25 +02:00
parent 433d96bbb4 1ed043716e
commit 1e9df1cb4b
117 changed files with 3952 additions and 2105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/openspace/scene/profile.h
-1
View File
@@ -28,7 +28,6 @@
#include <openspace/interaction/navigationhandler.h>
#include <openspace/scene/profilefile.h>
#include <openspace/scene/scenegraphnode.h>
#include <openspace/scene/scenelicense.h>
#include <ghoul/misc/easing.h>
#include <ghoul/misc/exception.h>
#include <mutex>