Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 08:29:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'pastel' of https://github.com/samcake/hifi into pastel

Browse source
This commit is contained in:
samcake 2018-01-30 17:18:10 -08:00
commit 7aa5ef3de7
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/Application.cpp
View file

@ -2283,7 +2283,7 @@ void Application::initializeGL() {
#ifdef Q_OS_OSX #ifdef Q_OS_OSX
// FIXME: on mac os the shaders take up to 1 minute to compile, so we pause the deadlock watchdog thread. // FIXME: on mac os the shaders take up to 1 minute to compile, so we pause the deadlock watchdog thread.
+DeadlockWatchdogThread::pause(); DeadlockWatchdogThread::pause();
#endif #endif
// Set up the render engine // Set up the render engine