Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'sunshine' of git://github.com/Shyotl/SingularityViewer

Browse Source 
Conflicts:
	indra/newview/lldrawable.cpp
	indra/newview/llviewerwindow.cpp
This commit is contained in:
Siana Gearz
2013-02-26 00:20:26 +01:00
parent a4b49e3fc2 d27b329afb
commit 13e0bc2742
23 changed files with 415 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
indra/newview/lldrawable.cpp
View File

@@ -546,7 +546,6 @@ F32 LLDrawable::updateXform(BOOL undamped)
}
}
if ((mCurrentScale != target_scale) ||
(!isRoot() &&
(dist_squared >= MIN_INTERPOLATE_DISTANCE_SQUARED ||