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

from Maciej Krol:\nFixes for OSG_USE_PTR_IMPLICIT_OUTPUT_CONVERSION = OFF

Browse Source
This commit is contained in:
Cedric Pinson
2009-05-12 11:54:50 +00:00
parent bdaead21bf
commit c98466d401
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/osgAnimation/MorphGeometry.cpp
View File

@@ -75,7 +75,7 @@ void MorphGeometry::transformSoftwareMethod()
// See if we have an internal optimized geometry
osg::Geometry* morphGeometry = this;
if (_internalOptimizedGeometry.valid())
morphGeometry = _internalOptimizedGeometry;
morphGeometry = _internalOptimizedGeometry.get();
osg::Vec3Array* pos = dynamic_cast<osg::Vec3Array*>(morphGeometry->getVertexArray());
if (pos && _positionSource.size() != pos->size())

2
src/osgPlugins/osgAnimation/ReaderWriter.cpp
View File

@@ -593,7 +593,7 @@ bool Animation_writeLocalData(const Object& obj, Output& fw)
fw.indent() << "num_channels " << anim.getChannels().size() << std::endl;
for (unsigned int i = 0; i < anim.getChannels().size(); i++)
{
osgAnimation::Channel* pChannel = anim.getChannels()[i];
osgAnimation::Channel* pChannel = anim.getChannels()[i].get();
osgAnimation::DoubleLinearChannel* pDlc = dynamic_cast<osgAnimation::DoubleLinearChannel*>(pChannel);
if (pDlc)