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

Added missing {} to fix getPassed() bug introducted by previus commit

Browse Source
This commit is contained in:
Robert Osfield
2019-01-26 18:10:44 +00:00
parent cd150cbe96
commit 0f2e9e6557
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/osg/OcclusionQueryNode.cpp
View File

@@ -474,10 +474,12 @@ OcclusionQueryNode::OcclusionQueryNode( const OcclusionQueryNode& oqn, const Cop
bool OcclusionQueryNode::getPassed( const Camera* camera, NodeVisitor& nv )
{
if ( !_enabled )
{
// Queries are not enabled. The caller should be osgUtil::CullVisitor,
// return true to traverse the subgraphs.
_passed = true;
return _passed;
}
{
// Two situations where we want to simply do a regular traversal:
@@ -487,7 +489,8 @@ bool OcclusionQueryNode::getPassed( const Camera* camera, NodeVisitor& nv )
OpenThreads::ScopedLock<OpenThreads::Mutex> lock( _frameCountMutex );
const unsigned int& lastQueryFrame( _frameCountMap[ camera ] );
if( ( lastQueryFrame == 0 ) ||
( (nv.getTraversalNumber() - lastQueryFrame) > (_queryFrameCount + 1) ) ) {
( (nv.getTraversalNumber() - lastQueryFrame) > (_queryFrameCount + 1) ) )
{
_passed = true;
return _passed;
}