From f71d1db58de8646b9cb74e74acb617c397be1db5 Mon Sep 17 00:00:00 2001
From: prep <prep@lindenlab.com>
Date: Wed, 11 Jul 2012 10:47:45 -0400
Subject: MAINT-1253 Rigged meshes in the upload model window now have a
material applied instead of white.
---
indra/newview/llfloatermodelpreview.cpp | 9 +++++++++
1 file changed, 9 insertions(+)
(limited to 'indra')
diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp
index e8cf7d1ba4..489f0eca9b 100755
--- a/indra/newview/llfloatermodelpreview.cpp
+++ b/indra/newview/llfloatermodelpreview.cpp
@@ -5531,6 +5531,15 @@ BOOL LLModelPreview::render()
buffer->setBuffer(type_mask & buffer->getTypeMask());
gGL.diffuseColor4fv(material.mDiffuseColor.mV);
gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
+ if (material.mDiffuseMap.notNull())
+ {
+ if (material.mDiffuseMap->getDiscardLevel() > -1)
+ {
+ gGL.getTexUnit(0)->bind(material.mDiffuseMap, true);
+ mTextureSet.insert(material.mDiffuseMap.get());
+ }
+ }
+
buffer->draw(LLRender::TRIANGLES, buffer->getNumIndices(), 0);
gGL.diffuseColor3f(0.4f, 0.4f, 0.4f);
--
cgit v1.2.3