SGCT compile fix

First pass for pull request
This commit is contained in:
Alexander Bock
2020-06-11 00:24:58 +02:00
parent 748fc64d60
commit 433d96bbb4
19 changed files with 306 additions and 298 deletions
+3 -3
View File
@@ -517,7 +517,7 @@ void mainPostSyncPreDrawFunc() {
void mainRenderFunc(const RenderData& data) {
void mainRenderFunc(const sgct::RenderData& data) {
ZoneScoped
#ifdef OPENSPACE_HAS_VTUNE
@@ -592,7 +592,7 @@ void mainRenderFunc(const RenderData& data) {
void mainDraw2DFunc(const RenderData& data) {
void mainDraw2DFunc(const sgct::RenderData& data) {
ZoneScoped
#ifdef OPENSPACE_HAS_VTUNE
@@ -1295,9 +1295,9 @@ int main(int argc, char** argv) {
Engine::create(cluster, callbacks, config);
}
catch (...) {
Engine::destroy();
global::openSpaceEngine.deinitialize();
ghoul::deinitialize();
Engine::destroy();
throw;
}