diff options
| author | Vir Linden <vir@lindenlab.com> | 2021-10-25 15:55:06 +0000 |
|---|---|---|
| committer | Vir Linden <vir@lindenlab.com> | 2021-10-25 15:55:06 +0000 |
| commit | ba3459f77fc9b93c8dd79bc3ac7c59ba792da27f (patch) | |
| tree | 6267b828141028889894be919263c6d19c6e54c1 /indra/newview/lldrawpoolbump.cpp | |
| parent | a42b5d680935f08310de69f240435a7b67227a4d (diff) | |
| parent | 3efd4c50a031ce0c1cb3d2fcc43e403136277e1f (diff) | |
Merged DRTVWR-546 into SL-15999
Diffstat (limited to 'indra/newview/lldrawpoolbump.cpp')
| -rw-r--r-- | indra/newview/lldrawpoolbump.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/lldrawpoolbump.cpp b/indra/newview/lldrawpoolbump.cpp index d75884cc16..b08fbcbd89 100644 --- a/indra/newview/lldrawpoolbump.cpp +++ b/indra/newview/lldrawpoolbump.cpp @@ -715,7 +715,8 @@ BOOL LLDrawPoolBump::bindBumpMap(U8 bump_code, LLViewerTexture* texture, F32 vsi } else { - gGL.getTexUnit(channel)->bindFast(bump); + // NOTE: do not use bindFast here (see SL-16222) + gGL.getTexUnit(channel)->bind(bump); } return TRUE; |