Merge remote-tracking branch 'origin/master' into issue/2313

# Conflicts:
#	modules/skybrowser/skybrowsermodule_lua.inl
This commit is contained in:
Ylva Selling
2023-02-10 13:06:38 -05:00
1943 changed files with 11678 additions and 14338 deletions

View File

@@ -2,7 +2,7 @@
* *
* OpenSpace *
* *
* Copyright (c) 2014-2022 *
* Copyright (c) 2014-2023 *
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
* software and associated documentation files (the "Software"), to deal in the Software *
@@ -56,7 +56,7 @@ ServerModule::ServerModule()
// Trigger callbacks
using K = CallbackHandle;
using V = CallbackFunction;
for (const std::pair<const K, V>& it : _preSyncCallbacks) {
for (const std::pair<K, V>& it : _preSyncCallbacks) {
it.second(); // call function
}
});