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

SG part of fix for TerraSync models.

Browse Source 
Ensure we search the TerraSync models tree before the FG_ROOT one,
since the TerraSync one contains newer files and updates to the base
one.
This commit is contained in:
James Turner 2013-08-29 22:13:43 +01:00
parent b468254d73
commit c0424aba7e
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
simgear/scene/tgdb/ReaderWriterSTG.cxx
View File

@ -185,6 +185,14 @@ struct ReaderWriterSTG::_ModelBin {
SGPath path = filePath; SGPath path = filePath;
path.append(".."); path.append(".."); path.append(".."); path.append(".."); path.append(".."); path.append("..");
sharedOptions->getDatabasePathList().push_back(path.str()); sharedOptions->getDatabasePathList().push_back(path.str());
// ensure Models directory synced via TerraSync is searched before the copy in
// FG_ROOT, so that updated models can be used.
std::string terrasync_root = options->getPluginStringData("SimGear::TERRASYNC_ROOT");
if (!terrasync_root.empty()) {
sharedOptions->getDatabasePathList().push_back(terrasync_root);
}
std::string fg_root = options->getPluginStringData("SimGear::FG_ROOT"); std::string fg_root = options->getPluginStringData("SimGear::FG_ROOT");
sharedOptions->getDatabasePathList().push_back(fg_root); sharedOptions->getDatabasePathList().push_back(fg_root);