History

Merge branch 'windows_build' of https://github.com/ZappoMan/hifi into windows_build

Brad Hefta-Gaub committed 12 years ago

Commit 3af47032 parents 2217d79 e60446a6 files · +1595 −0Browse files

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

Unified · Split

interface/src/Application.cpp+1−1
@@ -2136,7 +2136,7 @@ void Application::updateAvatars(float deltaTime, glm::vec3 mouseRayOrigin, glm:: · 2135 unmodified lines
2136 2136
2137 avatar->setTargetScale(avatar->getScale() * SHRINK_RATE);2137 avatar->setTargetScale(avatar->getScale() * SHRINK_RATE);
2138 2138
2139 const float MIN_FADE_SCALE = 0.001;2139 const float MIN_FADE_SCALE = 0.001f;
2140 2140
2141 if (avatar->getTargetScale() < MIN_FADE_SCALE) {2141 if (avatar->getTargetScale() < MIN_FADE_SCALE) {
2142 delete avatar;2142 delete avatar;

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