From e69aa18c0dfbef2fa3bbefeba08fa1c258c69fb3 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Tue, 29 Mar 2011 16:32:28 -0700
Subject: [PATCH] SH-1247 Upload Wizard should pull in textures, if defined in
.dae
---
indra/newview/llfloatermodelpreview.cpp | 2 +-
indra/newview/llfloatermodelwizard.cpp | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp
index 68373981dfa..4d498840fed 100755
--- a/indra/newview/llfloatermodelpreview.cpp
+++ b/indra/newview/llfloatermodelpreview.cpp
@@ -4218,9 +4218,9 @@ BOOL LLModelPreview::render()
glColor4fv(instance.mMaterial[i].mDiffuseColor.mV);
if (i < instance.mMaterial.size() && instance.mMaterial[i].mDiffuseMap.notNull())
{
- gGL.getTexUnit(0)->bind(instance.mMaterial[i].mDiffuseMap, true);
if (instance.mMaterial[i].mDiffuseMap->getDiscardLevel() > -1)
{
+ gGL.getTexUnit(0)->bind(instance.mMaterial[i].mDiffuseMap, true);
mTextureSet.insert(instance.mMaterial[i].mDiffuseMap.get());
}
}
diff --git a/indra/newview/llfloatermodelwizard.cpp b/indra/newview/llfloatermodelwizard.cpp
index ad6e4ebe9c0..9751b87b4c0 100644
--- a/indra/newview/llfloatermodelwizard.cpp
+++ b/indra/newview/llfloatermodelwizard.cpp
@@ -531,6 +531,7 @@ BOOL LLFloaterModelWizard::postBuild()
mModelPreview->setPreviewTarget(16.f);
mModelPreview->setDetailsCallback(boost::bind(&LLFloaterModelWizard::setDetails, this, _1, _2, _3, _4, _5));
mModelPreview->setModelLoadedCallback(boost::bind(&LLFloaterModelWizard::modelLoadedCallback, this));
+ mModelPreview->mViewOption["show_textures"] = true;
center();
--
GitLab