Merge branch 'master' into thesis/2020/radiation

This commit is contained in:
ElonOlsson
2021-09-13 18:23:33 -04:00
214 changed files with 9042 additions and 5664 deletions
@@ -28,8 +28,8 @@
#include <modules/fieldlinessequence/util/kameleonfieldlinehelper.h>
#include <openspace/engine/globals.h>
#include <openspace/engine/windowdelegate.h>
#include <openspace/interaction/navigationhandler.h>
#include <openspace/interaction/orbitalnavigator.h>
#include <openspace/navigation/navigationhandler.h>
#include <openspace/navigation/orbitalnavigator.h>
#include <openspace/rendering/renderengine.h>
#include <openspace/scene/scene.h>
#include <openspace/util/timemanager.h>