kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Follow up to the previous commit: vfont_get_data is to use the same RW lock

Browse Source
This commit is contained in:
Sergey Sharybin 2013-12-29 17:07:38 +06:00
parent df5631216a
commit 3b08ee8996
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/blenkernel/intern/font.c
View File

@ -64,7 +64,6 @@
#include "BKE_curve.h"
#include "BKE_displist.h"
static ThreadMutex vfont_mutex = BLI_MUTEX_INITIALIZER;
static ThreadRWMutex vfont_rwlock = BLI_RWLOCK_INITIALIZER;
/* The vfont code */
@ -150,7 +149,7 @@ static VFontData *vfont_get_data(Main *bmain, VFont *vfont)
if (!vfont->data) {
PackedFile *pf;
BLI_mutex_lock(&vfont_mutex);
BLI_rw_mutex_lock(&vfont_rwlock, THREAD_LOCK_WRITE);
if (vfont->data) {
/* Check data again, since it might have been already
@ -158,7 +157,7 @@ static VFontData *vfont_get_data(Main *bmain, VFont *vfont)
* not accurate or threading, just prevents unneeded
* lock if all the data is here for sure).
*/
BLI_mutex_unlock(&vfont_mutex);
BLI_rw_mutex_unlock(&vfont_rwlock);
return vfont->data;
}
@ -200,7 +199,7 @@ static VFontData *vfont_get_data(Main *bmain, VFont *vfont)
}
}
BLI_mutex_unlock(&vfont_mutex);
BLI_rw_mutex_unlock(&vfont_rwlock);
}
return vfont->data;