diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2013-01-24 14:28:09 -0500 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2013-01-24 14:28:09 -0500 |
commit | 3b369770f7a81ca76b81087d2716c5f29211f7c2 (patch) | |
tree | 70ad9096da75c663590a546fa9f12dcfe7b11373 /indra/newview/lldrawable.cpp | |
parent | 22db60ed0dfd606ab8f8d49141446442a4a72a48 (diff) | |
parent | cebde0a32b4a8163010d9cbf5e6b3036865ed943 (diff) |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-development
Diffstat (limited to 'indra/newview/lldrawable.cpp')
-rw-r--r-- | indra/newview/lldrawable.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp index 7cfb58e544..647c3355ca 100644 --- a/indra/newview/lldrawable.cpp +++ b/indra/newview/lldrawable.cpp @@ -547,6 +547,12 @@ F32 LLDrawable::updateXform(BOOL undamped) } } } + else + { + dist_squared = dist_vec_squared(old_pos, target_pos); + dist_squared += (1.f - dot(old_rot, target_rot)) * 10.f; + dist_squared += dist_vec_squared(old_scale, target_scale); + } LLVector3 vec = mCurrentScale-target_scale; |