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

[**] pragma(tic) fix: 'defineMap.changed flag' condition changed in State::push/popDefineList

Browse Source
This commit is contained in:
konstantin.matveyev
2017-07-31 00:53:24 +03:00
parent 0c1fad2c91
commit 23edfad1fd
2 changed files with 17 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/osg/State
View File

@@ -2108,7 +2108,7 @@ inline void State::pushDefineList(DefineMap& defineMap,const StateSet::DefineLis
dv.push_back(StateSet::DefinePair(aitr->second.first,aitr->second.second));
// if the back of the stack has changed since the last then mark it as changed.
bool changed = (dv[dv.size()-2].first==dv[dv.size()-1].first);
bool changed = (dv[dv.size()-2] != dv.back());
if (changed)
{
ds.changed = true;
@@ -2177,7 +2177,7 @@ inline void State::popDefineList(DefineMap& defineMap,const StateSet::DefineList
if (!dv.empty())
{
// if the stack has less than 2 entries or new back vs old back are different then mark the DefineStack as changed
if ((dv.size()<2) || (dv[dv.size()-2].first!=dv.back().first))
if ((dv.size() < 2) || (dv[dv.size()-2] != dv.back()))
{
ds.changed = true;
defineMap.changed = true;