The commit messages for these commits seem self-explanatory.
commit f38db3f433e77cd59c2332dbda779774768bcf96
Author: John Denker <[email protected]>
Date: Tue Feb 2 22:00:17 2010 -0700
Get rid of annoying "Failed to load object" message.
diff --git a/materials.xml b/materials.xml
index 0ccd581..9e65486 100644
--- a/materials.xml
+++ b/materials.xml
@@ -988,7 +988,6 @@ Shared parameters for various materials.
<path>Models/Residential/zone_maisons_carre-ba.ac</path>
<path>Models/Residential/zone_maisons_long-ba.ac</path>
<path>Models/Residential/zone_maisons_grd-ba.ac</path>
- <path></path>
<coverage-m2>100000</coverage-m2>
<heading-type>random</heading-type>
</object>
=======================
commit 35c48371ef05b52c5fdeb1f0e9ae0da020116ec3
Author: John Denker <[email protected]>
Date: Tue Feb 2 22:07:59 2010 -0700
Fix SGMatModel::load_models so that errors in the materials.xml file
are easier to track down next time.
diff --git a/simgear/scene/material/matmodel.cxx
b/simgear/scene/material/matmodel.cxx
index bdad512..8123a23 100644
--- a/simgear/scene/material/matmodel.cxx
+++ b/simgear/scene/material/matmodel.cxx
@@ -127,7 +127,18 @@ SGMatModel::load_models( SGPropertyNode *prop_root )
_models.push_back(entity);
} else {
- SG_LOG(SG_INPUT, SG_ALERT, "Failed to load object " << _paths[i]);
+ // This error can be generated by bad entries in
+ // the materials.xml file.
+ SG_LOG(SG_INPUT, SG_ALERT,
+ "SGMatModel::load_models failed to load object via path["
+ << i << "] : '" << _paths[i] << "'");
+ if (_paths[i].length() == 0) {
+ for (int j = 0; j < _paths.size(); j++) {
+ SG_LOG(SG_INPUT, SG_ALERT,
+ "... path["
+ << j << "] : '" << _paths[j] << "'");
+ }
+ }
}
}
}
------------------------------------------------------------------------------
The Planet: dedicated and managed hosting, cloud storage, colocation
Stay online with enterprise data centers and the best network in the business
Choose flexible plans and management services without long-term contracts
Personal 24x7 support from experience hosting pros just a phone call away.
http://p.sf.net/sfu/theplanet-com
_______________________________________________
Flightgear-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/flightgear-devel
