griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix #23690: threading crash with compositing nodes and scopes view.

Browse Source
This commit is contained in:
Brecht Van Lommel
2010-09-25 16:35:02 +00:00
parent 58082beda9
commit 9da82e2d68
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/blenkernel/intern/image.c
View File

@@ -2020,14 +2020,9 @@ static ImBuf *image_get_ibuf_threadsafe(Image *ima, ImageUser *iuser, int *frame
ibuf= image_get_ibuf(ima, IMA_NO_INDEX, 0);
}
else if(ima->source == IMA_SRC_VIEWER) {
if(ima->type==IMA_TYPE_R_RESULT) {
/* always verify entirely, not that this shouldn't happen
* during render anyway */
}
else if(ima->type==IMA_TYPE_COMPOSITE) {
frame= iuser?iuser->framenr:0;
ibuf= image_get_ibuf(ima, 0, frame);
}
/* always verify entirely, not that this shouldn't happen
* as part of texture sampling in rendering anyway, so not
* a big bottleneck */
}
*frame_r = frame;