diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-04-26 16:50:48 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-04-26 16:50:48 +0400 |
| commit | a547e91d41c566f15d0aeb15841414f56723f6e5 (patch) | |
| tree | ac84d08f783632e67eb571a06f1c2e792c7597d2 /source/blender/blenkernel/intern/image.c | |
| parent | f39163acd703d3e2a15cc07670d284ade1556ebe (diff) | |
Two bugfixes from the render branch:
* Fix for FSA update while rendering fix, should set float rect to NULL.
* Fix for irradiance cache mutex unlock that got lost in code changes.
Diffstat (limited to 'source/blender/blenkernel/intern/image.c')
| -rw-r--r-- | source/blender/blenkernel/intern/image.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index 7b727244dcb..2c71cc9310a 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -1950,11 +1950,19 @@ static ImBuf *image_get_render_result(Image *ima, ImageUser *iuser, void **lock_ ibuf->flags |= IB_rectfloat; ibuf->channels= channels; } + else { + ibuf->rect_float= NULL; + ibuf->flags &= ~IB_rectfloat; + } if(rectz) { ibuf->zbuf_float= rectz; ibuf->flags |= IB_zbuffloat; } + else { + ibuf->zbuf_float= NULL; + ibuf->flags &= ~IB_zbuffloat; + } ibuf->dither= dither; |