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

This commit is contained in:
Emil Axelsson
2017-12-17 18:30:00 +01:00
210 changed files with 5201 additions and 1299 deletions
@@ -51,6 +51,9 @@ public:
/// The key that stores the location of the SGCT configuration file that is used on
/// application launch
static const std::string KeyConfigSgct;
/// The key that defines a list of scripts for global customization that get executed
/// regardless of which scene is loaded
static const std::string KeyGlobalCustomizationScripts;
/// The part of the key that defines the type
static const std::string PartType;
/// The part of the key that defines the file