diff options
| author | cosmic-linden <111533034+cosmic-linden@users.noreply.github.com> | 2023-04-28 13:21:33 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-28 13:21:33 -0700 |
| commit | 04604a921d35cf877073828f98a05ae83d03c96e (patch) | |
| tree | 4db7ff4d02556bdbdc9df18629a14a8fcc67bd4d /indra/newview/lldrawpoolbump.cpp | |
| parent | 01565d122a371820f4287dec3b1a52a5f4d342ea (diff) | |
| parent | 0fedb22d77bc67cd5c619537d985b905fe57e385 (diff) | |
Merge pull request #196 from secondlife/SL-19644
SL-19644: Move GLTF transform reset out of pushBatch
Diffstat (limited to 'indra/newview/lldrawpoolbump.cpp')
| -rw-r--r-- | indra/newview/lldrawpoolbump.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/lldrawpoolbump.cpp b/indra/newview/lldrawpoolbump.cpp index 75b47b2c22..a548740ec4 100644 --- a/indra/newview/lldrawpoolbump.cpp +++ b/indra/newview/lldrawpoolbump.cpp @@ -1254,15 +1254,13 @@ void LLDrawPoolBump::pushBumpBatches(U32 type) } } -void LLDrawPoolBump::pushBatch(LLDrawInfo& params, bool texture, bool batch_textures, bool reset_gltf) +void LLDrawPoolBump::pushBatch(LLDrawInfo& params, bool texture, bool batch_textures) { LL_PROFILE_ZONE_SCOPED_CATEGORY_DRAWPOOL; applyModelMatrix(params); bool tex_setup = false; - if (reset_gltf) { LLRenderPass::resetGLTFTextureTransform(); } - if (batch_textures && params.mTextureList.size() > 1) { for (U32 i = 0; i < params.mTextureList.size(); ++i) |