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.

diff --git a/source/blender/editors/sculpt_paint/paint_image.c b/source/blender/editors/sculpt_paint/paint_image.c
index 6f4f996d00427219481f71360deebe53ba1d43d5..f4ab598d3a90aca6f1f110d27952930f555fca3c 100644 (file)
--- a/source/blender/editors/sculpt_paint/paint_image.c
+++ b/source/blender/editors/sculpt_paint/paint_image.c
@@ -432,7 +432,8 @@ static void image_undo_restore(bContext *C, ListBase *lb)
 
                GPU_free_image(ima); /* force OpenGL reload */
                if(ibuf->rect_float)
-                       imb_freerectImBuf(ibuf); /* force recreate of char rect */
+                       ibuf->userflags |= IB_RECT_INVALID; /* force recreate of char rect */
+
        }
 
        IMB_freeImBuf(tmpibuf);
@@ -4022,7 +4023,7 @@ static void imapaint_image_update(SpaceImage *sima, Image *image, ImBuf *ibuf, s
 {
        if(ibuf->rect_float)
                /* TODO - should just update a portion from imapaintpartial! */
-               imb_freerectImBuf(ibuf); /* force recreate of char rect */
+               ibuf->userflags |= IB_RECT_INVALID; /* force recreate of char rect */
        
        if(ibuf->mipmap[0])
                ibuf->userflags |= IB_MIPMAP_INVALID;

diff --git a/source/blender/editors/space_image/image_draw.c b/source/blender/editors/space_image/image_draw.c
index 22ca549637e8c74aeb9f317ba05d6d1dd1e21ac0..5fd86e2ed9a03adb756d47f6e576f19e9ba181e0 100644 (file)
--- a/source/blender/editors/space_image/image_draw.c
+++ b/source/blender/editors/space_image/image_draw.c
@@ -83,7 +83,7 @@ static void image_verify_buffer_float(Image *ima, ImBuf *ibuf, int color_manage)
           NOTE: if float buffer changes, we have to manually remove the rect
        */
 
-       if(ibuf->rect_float && ibuf->rect==NULL) {
+       if(ibuf->rect_float && (ibuf->rect==NULL || (ibuf->userflags & IB_RECT_INVALID)) ) {
                if(color_manage) {
                        if(ima && ima->source == IMA_SRC_VIEWER)
                                ibuf->profile = IB_PROFILE_LINEAR_RGB;

diff --git a/source/blender/imbuf/IMB_imbuf_types.h b/source/blender/imbuf/IMB_imbuf_types.h
index f60c6d03547ce3e0a3a25de1ae8660ac891db050..5629ead80db2b9d076b6bda0dbcb7641f0b8405e 100644 (file)
--- 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

diff --git a/source/blender/imbuf/intern/allocimbuf.c b/source/blender/imbuf/intern/allocimbuf.c
index 17387c0a4d315741f3de8c0a8a5b589c21ec44e9..fa823169966247c86eacd9b5d5784ef06e413bdd 100644 (file)
--- 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);

diff --git a/source/blender/imbuf/intern/divers.c b/source/blender/imbuf/intern/divers.c
index 9e2c32765d2d82bc23aa0f2794d85f3a9ac1dcc0..9605185e897843ffd1dd8f082154199276753739 100644 (file)
--- 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)

diff --git a/source/blender/nodes/intern/TEX_nodes/TEX_image.c b/source/blender/nodes/intern/TEX_nodes/TEX_image.c
index c764c7a22d2994c3d1381248749d410ef01b227b..7c680b4c25ac69d329eae35f905f6446a5536bfa 100644 (file)
--- a/source/blender/nodes/intern/TEX_nodes/TEX_image.c
+++ b/source/blender/nodes/intern/TEX_nodes/TEX_image.c
@@ -58,7 +58,13 @@ static void colorfn(float *out, TexParams *p, bNode *node, bNodeStack **UNUSED(i
                        py = (int)( (y-yoff) * ysize );
                
                        if( (!xsize) || (!ysize) ) return;
-                       if( !ibuf->rect_float ) IMB_float_from_rect(ibuf);
+                       
+                       if( !ibuf->rect_float ) {
+                               BLI_lock_thread(LOCK_IMAGE);
+                               if( !ibuf->rect_float )
+                                       IMB_float_from_rect(ibuf);
+                               BLI_unlock_thread(LOCK_IMAGE);
+                       }
                        
                        while( px < 0 ) px += ibuf->x;
                        while( py < 0 ) py += ibuf->y;