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

Use $FG_ROOT/Compositor/Effects instead of $FG_ROOT/Effects when the compositor is enabled

Browse Source 
This allows coexistence of new compositor-compatible effects and current effects.
This commit is contained in:
Fernando García Liñán 2019-05-20 23:40:12 +02:00
parent 81d1e16d7b
commit b322fa8f32
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
simgear/scene/material/makeEffect.cxx
View File

@ -33,6 +33,7 @@
#include <simgear/debug/logstream.hxx>
#include <simgear/scene/util/SGReaderWriterOptions.hxx>
#include <simgear/props/props_io.hxx>
#include <simgear/scene/tgdb/userdata.hxx>
#include <simgear/scene/util/SGSceneFeatures.hxx>
#include <simgear/scene/util/SplicingVisitor.hxx>
#include <simgear/structure/SGExpression.hxx>
@ -126,7 +127,12 @@ Effect* makeEffect(const string& name,
itr->second.valid())
return itr->second.get();
}
string effectFileName(name);
string effectFileName;
// Use getPropertyRoot() because the SGReaderWriterOptions might not have a
// valid property tree
if (getPropertyRoot()->getBoolValue("/sim/version/compositor-support", false))
effectFileName += "Compositor/";
effectFileName += name;
effectFileName += ".eff";
string absFileName
= SGModelLib::findDataFile(effectFileName, options);