diff options
| author | Brad Linden <46733234+brad-linden@users.noreply.github.com> | 2024-06-18 11:48:37 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-18 11:48:37 -0700 |
| commit | 4e593dcded0ab1cc033a9be4d0489d12a8305a7e (patch) | |
| tree | eb12b6af64b6da0444776034025fec9141ce41ce /indra/newview/lldrawpool.cpp | |
| parent | 3da16d1899324b358ac0d27ddd99bf8214f6fb54 (diff) | |
| parent | 7342ebf43aa7500afe7410b49689a3aefa669e58 (diff) | |
Merge pull request #1797 from secondlife/release/maint-a
merge release/maint-a into develop and close maint-a
Diffstat (limited to 'indra/newview/lldrawpool.cpp')
| -rw-r--r-- | indra/newview/lldrawpool.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/lldrawpool.cpp b/indra/newview/lldrawpool.cpp index 9ba4f7f300..739975eab4 100644 --- a/indra/newview/lldrawpool.cpp +++ b/indra/newview/lldrawpool.cpp @@ -756,9 +756,12 @@ void LLRenderPass::pushGLTFBatch(LLDrawInfo& params) { auto& mat = params.mGLTFMaterial; - mat->bind(params.mTexture); + if (mat.notNull()) + { + mat->bind(params.mTexture); + } - LLGLDisable cull_face(mat->mDoubleSided ? GL_CULL_FACE : 0); + LLGLDisable cull_face(mat.notNull() && mat->mDoubleSided ? GL_CULL_FACE : 0); setup_texture_matrix(params); |