Merge remote-tracking branch 'zini/master' into ptr-improvements

This commit is contained in:
Chris Robinson 2013-08-15 07:11:38 -07:00
commit 58481ec7c3

View file

@ -465,7 +465,7 @@ namespace MWWorld
iter!=mWorldScene->getActiveCells().end(); ++iter)
{
Ptr::CellStore* cellstore = *iter;
Ptr ptr = mCells.getPtr (name, *cellstore);
Ptr ptr = mCells.getPtr (name, *cellstore, true);
if (!ptr.isEmpty())
return ptr;