Fix merging issues

This commit is contained in:
Alexander Bock
2015-02-24 21:31:39 +01:00
parent 2d1a8932da
commit 47d6fe3141
2 changed files with 1 additions and 9 deletions

View File

@@ -105,7 +105,7 @@ int main(int argc, char** argv)
#ifdef __APPLE__
sgct::Engine::RunMode rm = sgct::Engine::RunMode::OpenGL_4_1_Core_Profile;
#else
sgct::Engine::RunMode rm = sgct::Engine::RunMode::OpenGL_4_2_Core_Profile;
sgct::Engine::RunMode rm = sgct::Engine::RunMode::OpenGL_4_3_Core_Profile;
#endif
const bool initSuccess = _sgctEngine->init(rm);
if (!initSuccess) {