From 08287102046993203a4dd891552efc4a4ced51a4 Mon Sep 17 00:00:00 2001 From: Ton Roosendaal Date: Mon, 17 Jan 2011 18:16:10 +0000 Subject: 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. --- source/blender/imbuf/IMB_imbuf_types.h | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'source/blender/imbuf/IMB_imbuf_types.h') diff --git a/source/blender/imbuf/IMB_imbuf_types.h b/source/blender/imbuf/IMB_imbuf_types.h index f60c6d03547..5629ead80db 100644 --- a/source/blender/imbuf/IMB_imbuf_types.h +++ b/source/blender/imbuf/IMB_imbuf_types.h @@ -137,12 +137,7 @@ typedef struct ImBuf { #define IB_BITMAPFONT (1 << 0) /* this image is a font */ #define IB_BITMAPDIRTY (1 << 1) /* image needs to be saved is not the same as filename */ #define IB_MIPMAP_INVALID (1 << 2) /* image mipmaps are invalid, need recreate */ - -/* From iff.h. This was once moved away by Frank, now Nzc moves it - * back. Such is the way it is... It is a long list of defines, and - * there are a few external defines in the back. Most of the stuff is - * probably imbuf_intern only. This will need to be merged later - * on. */ +#define IB_RECT_INVALID (1 << 3) /* float buffer changed, needs recreation of byte rect */ /** * \name Imbuf Component flags -- cgit v1.2.3