diff options
author | Dave Houlton <euclid@lindenlab.com> | 2022-05-26 16:16:47 -0600 |
---|---|---|
committer | Dave Houlton <euclid@lindenlab.com> | 2022-05-26 16:16:47 -0600 |
commit | 78c6c341c5c068878da3dd851acf36f73a03178d (patch) | |
tree | aec974cfa30a841599d2f927aec287482a4a3c08 /indra/newview/pipeline.cpp | |
parent | 3b3d3d88d1755ac08c7d22721fa3fe1657f7c5fd (diff) | |
parent | cdbd06e8ed6e3f4285a61f5c0b607a65dfdf8dfd (diff) |
Merge master v 6.6.1 into DRTVWR-559
Diffstat (limited to 'indra/newview/pipeline.cpp')
-rw-r--r-- | indra/newview/pipeline.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 55819449c6..3332185bfd 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -3877,7 +3877,11 @@ void LLPipeline::postSort(LLCamera& camera) if (!sShadowRender) { + // order alpha groups by distance std::sort(sCull->beginAlphaGroups(), sCull->endAlphaGroups(), LLSpatialGroup::CompareDepthGreater()); + + // order rigged alpha groups by avatar attachment order + std::sort(sCull->beginRiggedAlphaGroups(), sCull->endRiggedAlphaGroups(), LLSpatialGroup::CompareRenderOrder()); } LL_PUSH_CALLSTACKS(); |