fly/flightgear
1
0
Fork 0
Code Activity

Merge branch 'next' into radio-att

Browse source
This commit is contained in:
adrian 2011-09-04 14:21:53 +03:00
commit 2f0ea5f3f1
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/Scenery/tilemgr.cxx
View file

@ -250,8 +250,9 @@ void FGTileMgr::schedule_needed(const SGBucket& curr_bucket, double vis)
osg::Node* osg::Node*
FGTileMgr::loadTileModel(const string& modelPath, bool cacheModel) FGTileMgr::loadTileModel(const string& modelPath, bool cacheModel)
{ {
SGPath fullPath; SGPath fullPath = modelPath;
if (fgGetBool("/sim/paths/use-custom-scenery-data") == true) { if ((fullPath.isRelative())&&
(fgGetBool("/sim/paths/use-custom-scenery-data") == true)) {
string_list sc = globals->get_fg_scenery(); string_list sc = globals->get_fg_scenery();
for (string_list_iterator it = sc.begin(); it != sc.end(); ++it) { for (string_list_iterator it = sc.begin(); it != sc.end(); ++it) {
@ -265,8 +266,6 @@ FGTileMgr::loadTileModel(const string& modelPath, bool cacheModel)
} }
} }
} }
} else {
fullPath.append(modelPath);
} }
osg::Node* result = 0; osg::Node* result = 0;
try { try {
@ -276,7 +275,7 @@ FGTileMgr::loadTileModel(const string& modelPath, bool cacheModel)
new FGNasalModelData); new FGNasalModelData);
else else
result= result=
SGModelLib::loadPagedModel(modelPath, globals->get_props(), SGModelLib::loadPagedModel(fullPath.str(), globals->get_props(),
new FGNasalModelData); new FGNasalModelData);
} catch (const sg_io_exception& exc) { } catch (const sg_io_exception& exc) {
string m(exc.getMessage()); string m(exc.getMessage());