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/divers.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/divers.c')
-rw-r--r-- | source/blender/imbuf/intern/divers.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/imbuf/intern/divers.c b/source/blender/imbuf/intern/divers.c index 9e2c32765d2..9605185e897 100644 --- a/source/blender/imbuf/intern/divers.c +++ b/source/blender/imbuf/intern/divers.c @@ -188,6 +188,8 @@ void IMB_rect_from_float(struct ImBuf *ibuf) } } } + /* ensure user flag is reset */ + ibuf->userflags &= ~IB_RECT_INVALID; } static void imb_float_from_rect_nonlinear(struct ImBuf *ibuf, float *fbuf) |