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

Changed the reading of animation paths so that it's always done without using the osgDB object cache.

Browse Source 
This fixes a bug of reusing the animination path in an P3D file.
This commit is contained in:
Robert Osfield
2010-09-27 09:58:07 +00:00
parent fdfad4848b
commit 759749eb0c
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/osgPresentation/SlideShowConstructor.cpp
View File

@@ -1840,7 +1840,11 @@ osg::AnimationPathCallback* SlideShowConstructor::getAnimationPathCallback(const
{
if (!positionData.path.empty())
{
osg::ref_ptr<osg::Object> object = osgDB::readObjectFile(positionData.path, _options.get());
// need to create an Options object with cache off to prevent sharing of animation paths
osg::ref_ptr<osgDB::Options> options = _options.valid() ? _options->cloneOptions() : new osgDB::Options;
options->setObjectCacheHint(osgDB::Options::CACHE_NONE);
osg::ref_ptr<osg::Object> object = osgDB::readObjectFile(positionData.path, options.get());
osg::AnimationPath* animation = dynamic_cast<osg::AnimationPath*>(object.get());
if (animation)
{