History

Merge branch 'master' of github.com:highfidelity/hifi into model-scripting

Seth Alves committed 9 years ago

Commit 693aee02 parents 7afe091 ed380a78 files · +54 −50Browse files

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

Unified · Split

interface/src/Application.cpp+2−0
@@ -610,6 +610,8 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 609 unmodified lines
610 }610 }
611 }611 }
612 612
613 // make sure the debug draw singleton is initialized on the main thread.
614 DebugDraw::getInstance().removeMarker("");
613 615
614 _runningMarker.startRunningMarker();616 _runningMarker.startRunningMarker();
615 617

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t