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

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

Browse source
This commit is contained in:
Seth Alves 2015-05-06 08:55:06 -07:00
commit ff104bb915
2 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
examples/defaultScripts.js
View file

@ -12,7 +12,6 @@ Script.load("progress.js");
Script.load("edit.js"); Script.load("edit.js");
Script.load("selectAudioDevice.js"); Script.load("selectAudioDevice.js");
Script.load("controllers/hydra/hydraMove.js"); Script.load("controllers/hydra/hydraMove.js");
Script.load("headMove.js");
Script.load("inspect.js"); Script.load("inspect.js");
Script.load("lobby.js"); Script.load("lobby.js");
Script.load("notifications.js"); Script.load("notifications.js");

1
interface/src/Application.cpp
View file

@ -3254,6 +3254,7 @@ void Application::displaySide(Camera& theCamera, bool selfAvatarOnly, RenderArgs
{ {
PerformanceTimer perfTimer("3dOverlaysFront"); PerformanceTimer perfTimer("3dOverlaysFront");
glClear(GL_DEPTH_BUFFER_BIT); glClear(GL_DEPTH_BUFFER_BIT);
Glower glower; // Sets alpha to 1.0
_overlays.renderWorld(true); _overlays.renderWorld(true);
} }
activeRenderingThread = nullptr; activeRenderingThread = nullptr;