Merge pull request #1526 from ey6es/master

Fix compile error.
This commit is contained in:
Andrzej Kapolka 2014-01-14 16:16:38 -08:00
commit a1c6075c5b

View file

@ -87,7 +87,7 @@ void MyAvatar::simulate(float deltaTime, Transmitter* transmitter) {
_elapsedTimeMoving += deltaTime;
}
if (_scale != _newScale) {
if (_scale != _targetScale) {
float scale = (1.f - SMOOTHING_RATIO) * _scale + SMOOTHING_RATIO * _targetScale;
setScale(scale);
Application::getInstance()->getCamera()->setScale(scale);