History

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

Seth Alves committed 11 years ago

Commit d52a45b2 parents f061850 12c26f928 files · +776 −223Browse files

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

Unified · Split

interface/src/Application.cpp+5−0
@@ -3271,6 +3271,11 @@ void Application::displaySide(Camera& theCamera, bool selfAvatarOnly, RenderArgs · 3270 unmodified lines
3271 renderMode = RenderArgs::MIRROR_RENDER_MODE;3271 renderMode = RenderArgs::MIRROR_RENDER_MODE;
3272 }3272 }
3273 _entities.render(renderMode, renderSide, renderDebugFlags);3273 _entities.render(renderMode, renderSide, renderDebugFlags);
3274
3275 if (!Menu::getInstance()->isOptionChecked(MenuOption::Wireframe)) {
3276 // Restaure polygon mode
3277 glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
3278 }
3274 }3279 }
3275 3280
3276 // render JS/scriptable overlays3281 // render JS/scriptable overlays