From 571131d42e4230f58353e1eecb49882317f11a5b Mon Sep 17 00:00:00 2001 From: Andrzej Kapolka Date: Tue, 20 Aug 2013 17:25:54 -0700 Subject: [PATCH] No glow effect on the avatar, fixed OS X warning. --- interface/src/Application.cpp | 2 -- interface/src/renderer/GlowEffect.cpp | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 4c169463a4..adc5bb1b71 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -2360,10 +2360,8 @@ void Application::displaySide(Camera& whichCamera) { if (_myCamera.getMode() == CAMERA_MODE_MIRROR) { _myAvatar.getHead().setLookAtPosition(_myCamera.getPosition()); } - _glowEffect.begin(); _myAvatar.render(Menu::getInstance()->isOptionChecked(MenuOption::Mirror), Menu::getInstance()->isOptionChecked(MenuOption::AvatarAsBalls)); - _glowEffect.end(); _myAvatar.setDisplayingLookatVectors(Menu::getInstance()->isOptionChecked(MenuOption::LookAtVectors)); if (Menu::getInstance()->isOptionChecked(MenuOption::LookAtIndicator) && _isLookingAtOtherAvatar) { diff --git a/interface/src/renderer/GlowEffect.cpp b/interface/src/renderer/GlowEffect.cpp index b08d0680d5..936364f8c0 100644 --- a/interface/src/renderer/GlowEffect.cpp +++ b/interface/src/renderer/GlowEffect.cpp @@ -229,7 +229,8 @@ void GlowEffect::cycleRenderMode() { case BLUR_PERSIST_ADD_MODE: qDebug() << "Glow mode: Blur/persist/add\n"; break; - + + default: case DIFFUSE_ADD_MODE: qDebug() << "Glow mode: Diffuse/add\n"; break;