diff options
| author | Ton Roosendaal <ton@blender.org> | 2011-01-17 21:16:10 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2011-01-17 21:16:10 +0300 |
| commit | 08287102046993203a4dd891552efc4a4ced51a4 (patch) | |
| tree | 11cf097ecf7bfde6ee777dd7d27454d5479edcf2 /source/blender/imbuf/intern/allocimbuf.c | |
| parent | 4b7930dbbd8a11fb5db3e1cc81ca9ca5b0a69fc0 (diff) | |
Bugfix #25657
Three code fixes for 1 report. User experienced crashes while
painting on float buffer + having preview renders on.
- Texture Nodes: Image was re-allocated without using
proper thread lock
- Paint code: old convention to free the byte rect from
a float image as signal to re-create now is a proper
flag. This keeps image memory unchanged. Nice for render.
- Imbuf: call to make a byte rect from float was freeing
mipmaps unnecessary.
Diffstat (limited to 'source/blender/imbuf/intern/allocimbuf.c')
| -rw-r--r-- | source/blender/imbuf/intern/allocimbuf.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/imbuf/intern/allocimbuf.c b/source/blender/imbuf/intern/allocimbuf.c index 17387c0a4d3..fa823169966 100644 --- a/source/blender/imbuf/intern/allocimbuf.c +++ b/source/blender/imbuf/intern/allocimbuf.c @@ -277,7 +277,8 @@ short imb_addrectfloatImBuf(ImBuf *ibuf) if(ibuf==NULL) return FALSE; - imb_freerectfloatImBuf(ibuf); + if(ibuf->rect_float) + imb_freerectfloatImBuf(ibuf); /* frees mipmap too, hrm */ size = ibuf->x *ibuf->y; size = size *4 *sizeof(float); |