History

Merge remote-tracking branch 'upstream/master' into android_new_login

Gabriel Calero committed 8 years ago

Commit 9b63b762 parents 66b9751 6ac43c3295 files · +1304 −820Browse files

Showing the changes to interface/src/Application.cpp (1 of 295 files). Show all

Unified · Split

interface/src/Application.cpp+2−1
@@ -1334,6 +1334,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 1333 unmodified lines
1334 1334
1335 // Create the main thread context, the GPU backend, and the display plugins1335 // Create the main thread context, the GPU backend, and the display plugins
1336 initializeGL();1336 initializeGL();
1337 DependencyManager::get<TextureCache>()->setGPUContext(_gpuContext);
1337 qCDebug(interfaceapp, "Initialized Display.");1338 qCDebug(interfaceapp, "Initialized Display.");
1338 // Create the rendering engine. This can be slow on some machines due to lots of 1339 // Create the rendering engine. This can be slow on some machines due to lots of
1339 // GPU pipeline creation.1340 // GPU pipeline creation.
@@ -3655,7 +3656,7 @@ void Application::keyPressEvent(QKeyEvent* event) { · 2315 unmodified lines
3655 } else {3656 } else {
3656 showCursor(Cursor::Icon::DEFAULT);3657 showCursor(Cursor::Icon::DEFAULT);
3657 }3658 }
3658 } else {3659 } else if (!event->isAutoRepeat()){
3659 resetSensors(true);3660 resetSensors(true);
3660 }3661 }
3661 break;3662 break;