diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2011-03-22 20:40:45 -0400 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2011-03-22 20:40:45 -0400 |
| commit | d7eb9b36fe7c801d9bbb554ef40c3d8d712f5bfb (patch) | |
| tree | 6ecfd42c64c4ca452a7f32f74a72775536afb88a /indra/newview/lldrawpoolbump.cpp | |
| parent | 29dc641fbe7ab77f77fe19e2e7976980f0649b5b (diff) | |
| parent | 89e09646824122e20194400e93bcdb0b212f96fe (diff) | |
pulling from mesh development. merge.
Diffstat (limited to 'indra/newview/lldrawpoolbump.cpp')
| -rw-r--r-- | indra/newview/lldrawpoolbump.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/lldrawpoolbump.cpp b/indra/newview/lldrawpoolbump.cpp index bbce847fdc..0a642f494b 100644 --- a/indra/newview/lldrawpoolbump.cpp +++ b/indra/newview/lldrawpoolbump.cpp @@ -646,8 +646,6 @@ BOOL LLDrawPoolBump::bindBumpMap(U8 bump_code, LLViewerTexture* texture, F32 vsi break; } - llassert(bump); - if (bump) { if (channel == -2) |