History

Merge branch 'master' of github.com:highfidelity/hifi into dice-on-table-1

Seth Alves committed 11 years ago

Commit ff104bb2 parents 74743c9 410baa62 files · +1 −1Browse files

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

Unified · Split

interface/src/Application.cpp+1−0
@@ -3254,6 +3254,7 @@ void Application::displaySide(Camera& theCamera, bool selfAvatarOnly, RenderArgs · 3253 unmodified lines
3254 {3254 {
3255 PerformanceTimer perfTimer("3dOverlaysFront");3255 PerformanceTimer perfTimer("3dOverlaysFront");
3256 glClear(GL_DEPTH_BUFFER_BIT);3256 glClear(GL_DEPTH_BUFFER_BIT);
3257 Glower glower; // Sets alpha to 1.0
3257 _overlays.renderWorld(true);3258 _overlays.renderWorld(true);
3258 }3259 }
3259 activeRenderingThread = nullptr;3260 activeRenderingThread = nullptr;