FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote branch 'origin/releases/2.2.0' into next

Browse Source
This commit is contained in:
ThorstenB
2011-03-04 22:52:21 +01:00
parent 19636bda4e e55017bbfc
commit baf5116841
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/scene/material/TextureBuilder.cxx
+3 -3
View File
@@ -132,8 +132,8 @@ void TextureUnitBuilder::buildAttribute(Effect* effect, Pass* pass,
texture = TextureBuilder::buildFromType(effect, type, prop, texture = TextureBuilder::buildFromType(effect, type, prop,
options); options);
} }
catch (BuilderException& ) { catch (BuilderException& e) {
SG_LOG(SG_INPUT, SG_ALERT, "No image file, " SG_LOG(SG_INPUT, SG_ALERT, e.getFormattedMessage() << ", "
<< "maybe the reader did not set the filename attribute, " << "maybe the reader did not set the filename attribute, "
<< "using white for type '" << type << "' on '" << pass->getName() << "', in " << prop->getPath() ); << "using white for type '" << type << "' on '" << pass->getName() << "', in " << prop->getPath() );
texture = StateAttributeFactory::instance()->getWhiteTexture(); texture = StateAttributeFactory::instance()->getWhiteTexture();
@@ -213,7 +213,7 @@ TexTuple makeTexTuple(Effect* effect, const SGPropertyNode* props,
string imageName; string imageName;
if (pImage) if (pImage)
imageName = pImage->getStringValue(); imageName = pImage->getStringValue();
string absFileName = osgDB::findDataFile(imageName, options); string absFileName = SGModelLib::findDataFile(imageName, options);
const SGPropertyNode* pMipmapControl const SGPropertyNode* pMipmapControl
= getEffectPropertyChild(effect, props, "mipmap-control"); = getEffectPropertyChild(effect, props, "mipmap-control");