History

Merge branch 'master' of https://github.com/worklist/hifi into noculus

Andrzej Kapolka committed 12 years ago

Commit e84f5a52 parents 7874a2a 3ec785c10 files · +53 −37Browse files

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

Unified · Split

interface/src/Application.cpp+3−3
@@ -3704,7 +3704,7 @@ void Application::renderAvatars(bool forceRenderHead, bool selfAvatarOnly) { · 3703 unmodified lines
3704 if (!avatar->isInitialized()) {3704 if (!avatar->isInitialized()) {
3705 avatar->init();3705 avatar->init();
3706 }3706 }
3707 avatar->render(false, Menu::getInstance()->isOptionChecked(MenuOption::AvatarAsBalls));3707 avatar->render(false);
3708 avatar->setDisplayingLookatVectors(Menu::getInstance()->isOptionChecked(MenuOption::LookAtVectors));3708 avatar->setDisplayingLookatVectors(Menu::getInstance()->isOptionChecked(MenuOption::LookAtVectors));
3709 }3709 }
3710 3710
@@ -3714,12 +3714,12 @@ void Application::renderAvatars(bool forceRenderHead, bool selfAvatarOnly) { · 3 unmodified lines
3714 // render avatar fades3714 // render avatar fades
3715 Glower glower;3715 Glower glower;
3716 for (vector<Avatar*>::iterator fade = _avatarFades.begin(); fade != _avatarFades.end(); fade++) {3716 for (vector<Avatar*>::iterator fade = _avatarFades.begin(); fade != _avatarFades.end(); fade++) {
3717 (*fade)->render(false, Menu::getInstance()->isOptionChecked(MenuOption::AvatarAsBalls));3717 (*fade)->render(false);
3718 }3718 }
3719 }3719 }
3720 3720
3721 // Render my own Avatar3721 // Render my own Avatar
3722 _myAvatar.render(forceRenderHead, Menu::getInstance()->isOptionChecked(MenuOption::AvatarAsBalls));3722 _myAvatar.render(forceRenderHead);
3723 _myAvatar.setDisplayingLookatVectors(Menu::getInstance()->isOptionChecked(MenuOption::LookAtVectors));3723 _myAvatar.setDisplayingLookatVectors(Menu::getInstance()->isOptionChecked(MenuOption::LookAtVectors));
3724 3724
3725 if (Menu::getInstance()->isOptionChecked(MenuOption::LookAtIndicator) && _lookatTargetAvatar) {3725 if (Menu::getInstance()->isOptionChecked(MenuOption::LookAtIndicator) && _lookatTargetAvatar) {

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