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

Add missing lock in shareMaterial

Browse source
This commit is contained in:
scrawl 2017-02-01 03:06:59 +01:00
parent 34deb6e7b1
commit e399e10607
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
components/nifosg/nifloader.cpp
View file

@ -1643,10 +1643,12 @@ namespace NifOsg
osg::Material* shareMaterial(osg::Material* mat) osg::Material* shareMaterial(osg::Material* mat)
{ {
typedef std::set<osg::ref_ptr<osg::Material>, CompareMaterial> MatCache; typedef std::set<osg::ref_ptr<osg::Material>, CompareMaterial> MatCache;
static MatCache mats; static MatCache sMats;
MatCache::iterator found = mats.find(mat); static OpenThreads::Mutex sMutex;
if (found == mats.end()) OpenThreads::ScopedLock<OpenThreads::Mutex> lock(sMutex);
found = mats.insert(mat).first; MatCache::iterator found = sMats.find(mat);
if (found == sMats.end())
found = sMats.insert(mat).first;
return *found; return *found;
} }