livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SH-1247 Upload Wizard should pull in textures, if defined in .dae

meow-7.2.2
Leyla Farazha 2011-03-29 16:32:28 -07:00
parent 7c993e4490
commit e69aa18c0d
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llfloatermodelpreview.cpp
View File

@ -4218,9 +4218,9 @@ BOOL LLModelPreview::render()
glColor4fv(instance.mMaterial[i].mDiffuseColor.mV); glColor4fv(instance.mMaterial[i].mDiffuseColor.mV);
if (i < instance.mMaterial.size() && instance.mMaterial[i].mDiffuseMap.notNull()) 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) if (instance.mMaterial[i].mDiffuseMap->getDiscardLevel() > -1)
{ {
gGL.getTexUnit(0)->bind(instance.mMaterial[i].mDiffuseMap, true);
mTextureSet.insert(instance.mMaterial[i].mDiffuseMap.get()); mTextureSet.insert(instance.mMaterial[i].mDiffuseMap.get());
} }
} }

1
indra/newview/llfloatermodelwizard.cpp
View File

@ -531,6 +531,7 @@ BOOL LLFloaterModelWizard::postBuild()
mModelPreview->setPreviewTarget(16.f); mModelPreview->setPreviewTarget(16.f);
mModelPreview->setDetailsCallback(boost::bind(&LLFloaterModelWizard::setDetails, this, _1, _2, _3, _4, _5)); mModelPreview->setDetailsCallback(boost::bind(&LLFloaterModelWizard::setDetails, this, _1, _2, _3, _4, _5));
mModelPreview->setModelLoadedCallback(boost::bind(&LLFloaterModelWizard::modelLoadedCallback, this)); mModelPreview->setModelLoadedCallback(boost::bind(&LLFloaterModelWizard::modelLoadedCallback, this));
mModelPreview->mViewOption["show_textures"] = true;
center(); center();