archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix #23170: multithreaded texture baking could give wrong results with margin,

Browse Source 
with some threads not writing the margin mask.
This commit is contained in:
Brecht Van Lommel
2010-09-23 21:38:01 +00:00
parent 3b17b75451
commit 02fd98e1cf
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/render/intern/source/rendercore.c
View File

@@ -2562,10 +2562,9 @@ static void shade_tface(BakeShade *bs)
if (bs->usemask) {
if (bs->ibuf->userdata==NULL) {
BLI_lock_thread(LOCK_CUSTOM1);
if (bs->ibuf->userdata==NULL) { /* since the thread was locked, its possible another thread alloced the value */
if (bs->ibuf->userdata==NULL) /* since the thread was locked, its possible another thread alloced the value */
bs->ibuf->userdata = (void *)MEM_callocN(sizeof(char)*bs->rectx*bs->recty, "BakeMask");
bs->rect_mask= (char *)bs->ibuf->userdata;
}
bs->rect_mask= (char *)bs->ibuf->userdata;
BLI_unlock_thread(LOCK_CUSTOM1);
} else {
bs->rect_mask= (char *)bs->ibuf->userdata;