Fix T56610: crash saving images with python API.
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Thu, 30 Aug 2018 10:19:27 +0000 (12:19 +0200)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Thu, 30 Aug 2018 10:19:27 +0000 (12:19 +0200)
source/blender/makesrna/intern/rna_image_api.c

index b6ba06a84d522ae22c24333cc67c9a9a0f94bf99..dc625ca8d9a6321446eed4b916596deac4499612 100644 (file)
@@ -147,7 +147,7 @@ static void rna_Image_save(Image *image, Main *bmain, bContext *C, ReportList *r
                BKE_reportf(reports, RPT_ERROR, "Image '%s' does not have any image data", image->id.name + 2);
        }
 
-       BKE_image_release_ibuf(image, ibuf, &lock);
+       BKE_image_release_ibuf(image, ibuf, lock);
        WM_event_add_notifier(C, NC_IMAGE | NA_EDITED, image);
 }
 
@@ -243,7 +243,7 @@ static int rna_Image_gl_load(Image *image, ReportList *reports, int frame, int f
 
        if (ibuf == NULL || ibuf->rect == NULL) {
                BKE_reportf(reports, RPT_ERROR, "Image '%s' does not have any image data", image->id.name + 2);
-               BKE_image_release_ibuf(image, ibuf, NULL);
+               BKE_image_release_ibuf(image, ibuf, lock);
                return (int)GL_INVALID_OPERATION;
        }
 
@@ -260,7 +260,7 @@ static int rna_Image_gl_load(Image *image, ReportList *reports, int frame, int f
                image->bindcode[TEXTARGET_TEXTURE_2D] = 0;
        }
 
-       BKE_image_release_ibuf(image, ibuf, NULL);
+       BKE_image_release_ibuf(image, ibuf, lock);
 
        return error;
 }