diff options
| author | Brad Linden <brad@lindenlab.com> | 2024-06-18 11:55:30 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2024-06-18 11:55:30 -0700 |
| commit | 6393e88ca47998fc5dfae3ce2fc2fd41bf568f49 (patch) | |
| tree | a0c17d1b8e499740934f88780b2043e264eab078 /indra/newview/lldrawpool.cpp | |
| parent | d0dfffe659b24f5a6bfadc5cc612869e1f08bb93 (diff) | |
| parent | 4e593dcded0ab1cc033a9be4d0489d12a8305a7e (diff) | |
Merge remote-tracking branch 'origin/develop' into brad/webrtc-voice-develop
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); |