diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2020-09-22 16:38:55 -0600 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2020-09-22 16:38:55 -0600 |
| commit | 79b8c9de9be576f46f7471f726c6d8e3d91cc131 (patch) | |
| tree | 0d00fdcb12b4dfa5c9d5fb954188258285636f77 /indra/newview/llspatialpartition.cpp | |
| parent | c2c5e672e25d3272db0b062c3831abded6db9141 (diff) | |
| parent | 60ed688026269568a9eef67437dc780f88c92871 (diff) | |
Merge branch 'master' 6.4.9 into DRTVWR-510
Diffstat (limited to 'indra/newview/llspatialpartition.cpp')
| -rw-r--r-- | indra/newview/llspatialpartition.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp index 77bbcdada6..2cdba4d9ba 100644 --- a/indra/newview/llspatialpartition.cpp +++ b/indra/newview/llspatialpartition.cpp @@ -3448,7 +3448,7 @@ public: U8 index = facep->getTextureIndex(); if (facep->mDrawInfo) { - if (index < 255) + if (index < FACE_DO_NOT_BATCH_TEXTURES) { if (facep->mDrawInfo->mTextureList.size() <= index) { |