diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-05-26 15:05:28 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-05-26 15:05:28 -0500 |
| commit | 82c7088932061de1f1e5f75945a063be4d506447 (patch) | |
| tree | 62a39b353e3e0363184e11b5b466d8977945aeaf /indra/newview/llvovolume.cpp | |
| parent | fe2419b71a3a24d221a5da99c32c257dab92fcb1 (diff) | |
| parent | bac3623e26d62f6e1eb3c6be1f5fcfcf69a0e714 (diff) | |
merge
Diffstat (limited to 'indra/newview/llvovolume.cpp')
| -rw-r--r-- | indra/newview/llvovolume.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index c03ec67c79..a9f3abeef8 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -3354,7 +3354,6 @@ void LLVolumeGeometryManager::registerFace(LLSpatialGroup* group, LLFace* facep, model_mat = &(drawable->getRegion()->mRenderMatrix); } - U8 bump = (type == LLRenderPass::PASS_BUMP || type == LLRenderPass::PASS_POST_BUMP) ? facep->getTextureEntry()->getBumpmap() : 0; LLViewerTexture* tex = facep->getTexture(); |