diff options
| author | Brad Kittenbrink <brad@lindenlab.com> | 2009-02-18 21:10:16 +0000 |
|---|---|---|
| committer | Brad Kittenbrink <brad@lindenlab.com> | 2009-02-18 21:10:16 +0000 |
| commit | abdc99f21b542c4fea67030ddbd7166c9d1c6c63 (patch) | |
| tree | 3e984e405adfdec189ca8a047daca5250737ffbf /indra/newview/lldrawable.cpp | |
| parent | 34412f0530cf6a411b4de906a8e9da59cbcb3a85 (diff) | |
Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 (maint-render-9) and QAR-1236 (dll-msvcrt-2)
svn merge -r 109838:112264 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-9-merge-r109833
Diffstat (limited to 'indra/newview/lldrawable.cpp')
| -rw-r--r-- | indra/newview/lldrawable.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp index d5619f2bf0..47e4a2278f 100644 --- a/indra/newview/lldrawable.cpp +++ b/indra/newview/lldrawable.cpp @@ -532,10 +532,10 @@ F32 LLDrawable::updateXform(BOOL undamped) if ((mCurrentScale != target_scale) || (!isRoot() && - (dist_squared >= MIN_INTERPOLATE_DISTANCE_SQUARED) || + (dist_squared >= MIN_INTERPOLATE_DISTANCE_SQUARED || !mVObjp->getAngularVelocity().isExactlyZero() || target_pos != mXform.getPosition() || - target_rot != mXform.getRotation())) + target_rot != mXform.getRotation()))) { //child prim moving or scale change requires immediate rebuild gPipeline.markRebuild(this, LLDrawable::REBUILD_POSITION, TRUE); } @@ -1233,7 +1233,8 @@ void LLSpatialBridge::setVisible(LLCamera& camera_in, std::vector<LLDrawable*>* LLVector3 center = (mExtents[0] + mExtents[1]) * 0.5f; LLVector3 size = (mExtents[1]-mExtents[0]) * 0.5f; - if (LLPipeline::sImpostorRender || + if ((LLPipeline::sShadowRender && camera_in.AABBInFrustum(center, size)) || + LLPipeline::sImpostorRender || (camera_in.AABBInFrustumNoFarClip(center, size) && AABBSphereIntersect(mExtents[0], mExtents[1], camera_in.getOrigin(), camera_in.mFrustumCornerDist))) { @@ -1290,7 +1291,6 @@ void LLSpatialBridge::updateDistance(LLCamera& camera_in) LLDrawable* drawable = child->mDrawable; if (!drawable) { - llwarns << "Corrupt drawable found while updating spatial bridge distance." << llendl; continue; } |