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

This commit is contained in:
Emil Axelsson
2017-11-10 16:07:58 +01:00
482 changed files with 7286 additions and 3720 deletions

View File

@@ -58,7 +58,7 @@ void ModuleEngine::deinitialize() {
void ModuleEngine::registerModule(std::unique_ptr<OpenSpaceModule> m) {
ghoul_assert(m, "Module must not be nullptr");
auto it = std::find_if(
_modules.begin(),
_modules.end(),
@@ -72,7 +72,7 @@ void ModuleEngine::registerModule(std::unique_ptr<OpenSpaceModule> m) {
"ModuleEngine"
);
}
LDEBUG("Registering module '" << m->name() << "'");
m->initialize();
LDEBUG("Registered module '" << m->name() << "'");