From 0b8bfd9ed861740a62adc271e38ae6e11d10832b Mon Sep 17 00:00:00 2001 From: ThorstenB Date: Sat, 17 Mar 2012 10:15:31 +0100 Subject: [PATCH] More checks/error messages for missing files, checking return value of findDataFile. --- simgear/scene/material/mat.cxx | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/simgear/scene/material/mat.cxx b/simgear/scene/material/mat.cxx index 547140ca..582571f3 100644 --- a/simgear/scene/material/mat.cxx +++ b/simgear/scene/material/mat.cxx @@ -138,6 +138,10 @@ SGMaterial::read_properties(const SGReaderWriterOptions* options, tpath = SGPath("Textures"); tpath.append(tname); fullTexPath = SGModelLib::findDataFile(tpath.str(), options); + if (fullTexPath.empty()) { + SG_LOG(SG_GENERAL, SG_ALERT, "Cannot find texture \"" + << tname << "\" in Textures or Textures.high folders."); + } } if (tpath.lower_extension() == "dds") { @@ -171,6 +175,10 @@ SGMaterial::read_properties(const SGReaderWriterOptions* options, tpath = SGPath("Textures"); tpath.append(tname); fullTexPath = SGModelLib::findDataFile(tpath.str(), options); + if (fullTexPath.empty() ) { + SG_LOG(SG_GENERAL, SG_ALERT, "Cannot find texture \"" + << tname << "\" in Textures or Textures.high folders."); + } } if (j == 0) { @@ -214,8 +222,8 @@ SGMaterial::read_properties(const SGReaderWriterOptions* options, } if (fullMaskPath.empty()) { - SG_LOG(SG_GENERAL, SG_ALERT, "Cannot find texture file \"" - << ompath.str() << "\""); + SG_LOG(SG_GENERAL, SG_ALERT, "Cannot find texture \"" + << omname << "\" in Textures or Textures.high folders."); } else {