From Mathias Froehlich, build fixes for various unices
This commit is contained in:
@@ -14,6 +14,7 @@
|
||||
#ifndef OSG_CULLSETTINGS
|
||||
#define OSG_CULLSETTINGS 1
|
||||
|
||||
#include <iosfwd>
|
||||
#include <osg/Matrix>
|
||||
#include <osg/ClearNode>
|
||||
|
||||
|
||||
@@ -383,7 +383,7 @@ QueryGeometry::drawImplementation( osg::RenderInfo& renderInfo ) const
|
||||
"oagOQ: QG: Querying for: " << _oqnName << std::endl;
|
||||
|
||||
ext->glBeginQuery( GL_SAMPLES_PASSED_ARB, tr->_id );
|
||||
Geometry::drawImplementation( renderInfo );
|
||||
osg::Geometry::drawImplementation( renderInfo );
|
||||
ext->glEndQuery( GL_SAMPLES_PASSED_ARB );
|
||||
tr->_active = true;
|
||||
|
||||
|
||||
@@ -153,7 +153,7 @@ bool IntersectorGroup::containsIntersections()
|
||||
IntersectionVisitor::IntersectionVisitor(Intersector* intersector, ReadCallback* readCallback)
|
||||
{
|
||||
// override the default node visitor mode.
|
||||
setTraversalMode(NodeVisitor::TRAVERSE_ACTIVE_CHILDREN);
|
||||
setTraversalMode(osg::NodeVisitor::TRAVERSE_ACTIVE_CHILDREN);
|
||||
|
||||
setIntersector(intersector);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user