summaryrefslogtreecommitdiff
path: root/indra/newview/llvovolume.cpp
diff options
context:
space:
mode:
authorNyx (Neal Orman) <nyx@lindenlab.com>2011-02-22 14:48:32 -0500
committerNyx (Neal Orman) <nyx@lindenlab.com>2011-02-22 14:48:32 -0500
commit5c9ea3265408a4a18805a057d7934259b3a50ca1 (patch)
tree88b88204245e72beeac9a3286e4bc142ad00cef7 /indra/newview/llvovolume.cpp
parentad2c986098954096161406fccccfb7eec3729a81 (diff)
parentb53ffe4eae9700ad78f01cfec3458b5611330027 (diff)
merge
Diffstat (limited to 'indra/newview/llvovolume.cpp')
-rw-r--r--indra/newview/llvovolume.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 7e6f01bcf2..e3dea5c788 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -3818,6 +3818,10 @@ void LLVolumeGeometryManager::registerFace(LLSpatialGroup* group, LLFace* facep,
else
{
model_mat = &(drawable->getRegion()->mRenderMatrix);
+ if (model_mat->isIdentity())
+ {
+ model_mat = NULL;
+ }
}
U8 bump = (type == LLRenderPass::PASS_BUMP || type == LLRenderPass::PASS_POST_BUMP) ? facep->getTextureEntry()->getBumpmap() : 0;