Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix T56610: crash saving images with python API.

Browse Source
This commit is contained in:
Brecht Van Lommel
2018-08-30 12:19:27 +02:00
parent a1b38a635e
commit 22dc248f14
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/makesrna/intern/rna_image_api.c
View 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_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); 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) { if (ibuf == NULL || ibuf->rect == NULL) {
BKE_reportf(reports, RPT_ERROR, "Image '%s' does not have any image data", image->id.name + 2); 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; 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; image->bindcode[TEXTARGET_TEXTURE_2D] = 0;
} }
BKE_image_release_ibuf(image, ibuf, NULL); BKE_image_release_ibuf(image, ibuf, lock);
return error; return error;
} }