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

Merge branch 'master' of https://github.com/openscenegraph/osg

Browse Source
This commit is contained in:
Robert Osfield
2016-01-20 17:51:03 +00:00
parent 8fc287c1b7 1219a6d3bf
commit 4de2fc120d
8 changed files with 47 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/osgPlugins/logo/ReaderWriterLOGO.cpp
View File

@@ -38,7 +38,7 @@ class Logos: public osg::Drawable
virtual bool cull(osg::NodeVisitor *visitor, osg::Drawable* drawable, osg::State*) const
{
Logos *logos = dynamic_cast <Logos *>(drawable);
osgUtil::CullVisitor *cv = dynamic_cast<osgUtil::CullVisitor *>(visitor);
osgUtil::CullVisitor *cv = visitor->asCullVisitor();
if (!cv) return true;
unsigned int contextID = cv->getState()!=0 ? cv->getState()->getContextID() : 0;

2
src/osgPlugins/txp/TXPNode.cpp
View File

@@ -107,7 +107,7 @@ void TXPNode::traverse(osg::NodeVisitor& nv)
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex);
osgUtil::CullVisitor* cv = dynamic_cast<osgUtil::CullVisitor*>(&nv);
osgUtil::CullVisitor* cv = nv.asCullVisitor();
if (cv)
{
//#define PRINT_TILEMAPP_TIMEINFO