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

Build fixes for when ref_ptr<> has no auto type conversion

Browse Source
This commit is contained in:
Robert Osfield
2014-01-21 18:31:20 +00:00
parent 504b42aa61
commit e48d6812fa
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/osgVolume/MultipassTechnique.cpp
View File

@@ -390,9 +390,9 @@ void MultipassTechnique::init()
{
texture3D->setInternalFormatMode(internalFormatMode);
}
texture3D->setImage(image_3d);
texture3D->setImage(image_3d.get());
stateset->setTextureAttributeAndModes(volumeTextureUnit, texture3D, osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
stateset->setTextureAttributeAndModes(volumeTextureUnit, texture3D.get(), osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
osg::ref_ptr<osg::Uniform> baseTextureSampler = new osg::Uniform("volumeTexture", int(volumeTextureUnit));
stateset->addUniform(baseTextureSampler.get());
@@ -661,7 +661,7 @@ class RTTBackfaceCameraCullCallback : public osg::NodeCallback
{
osgUtil::CullVisitor* cv = dynamic_cast<osgUtil::CullVisitor*>(nv);
cv->pushProjectionMatrix(_tileData->projectionMatrix);
cv->pushProjectionMatrix(_tileData->projectionMatrix.get());
_mt->backfaceSubgraphCullTraversal(cv);