teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Keep a reference to the original scene template for as long as the instance is used

Browse source
This commit is contained in:
scrawl 2016-02-07 18:56:21 +01:00
parent 778bce3ae9
commit 41233fc8e5
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
components/resource/objectcache.cpp
View file

@ -23,12 +23,10 @@ namespace Resource
ObjectCache::ObjectCache():
osg::Referenced(true)
{
// OSG_NOTICE<<"Constructed ObjectCache"<<std::endl;
}
ObjectCache::~ObjectCache()
{
// OSG_NOTICE<<"Destructed ObjectCache"<<std::endl;
}
void ObjectCache::addEntryToObjectCache(const std::string& filename, osg::Object* object, double timestamp)

4
components/resource/scenemanager.cpp
View file

@ -373,6 +373,10 @@ namespace Resource
{
osg::ref_ptr<const osg::Node> scene = getTemplate(name);
osg::ref_ptr<osg::Node> cloned = osg::clone(scene.get(), SceneUtil::CopyOp());
// add a ref to the original template, to hint to the cache that it's still being used and should be kept in cache
cloned->getOrCreateUserDataContainer()->addUserObject(const_cast<osg::Node*>(scene.get()));
return cloned;
}