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

Fix issue with Effect techniques that have the highest index and a scheme

Browse Source 
We previously used the last technique, but now we use the last technique that has no scheme.
This commit is contained in:
Fernando García Liñán
2021-07-24 19:47:09 +02:00
parent d85205212a
commit 420555c69c
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/scene/material/Effect.cxx
+11 -3
View File
@@ -240,11 +240,19 @@ Effect::Effect(const Effect& rhs, const CopyOp& copyop)
_name += " clone"; _name += " clone";
} }
// Assume that the last technique is always valid. // Try to use the state set of the last technique without a scheme.
StateSet* Effect::getDefaultStateSet() StateSet* Effect::getDefaultStateSet()
{ {
Technique* tniq = techniques.back().get(); if (techniques.empty())
if (!tniq) return 0;
auto it = std::find_if(techniques.rbegin(), techniques.rend(),
[](const osg::ref_ptr<Technique> &t) {
return t && t->getScheme().empty();
});
if (it == techniques.rend())
return 0;
Technique* tniq = (*it);
if (tniq->passes.empty())
return 0; return 0;
Pass* pass = tniq->passes.front().get(); Pass* pass = tniq->passes.front().get();
return pass; return pass;