diff options
| author | Julian Eisel <julian@blender.org> | 2022-07-20 18:25:31 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2022-07-20 18:25:31 +0300 |
| commit | 9dbcefb10e53cc809eb2e99333376b2a881c0863 (patch) | |
| tree | 9ea058c2877c472aba82650e24e5927e3f03eded /source/blender/makesrna/intern/rna_image_api.c | |
| parent | e1ced645fa208b3b77e07c99cb289cf7fa659ad3 (diff) | |
| parent | 85f0b2ef5d5bfb67c245da0a52aeec44e63445fa (diff) | |
Merge branch 'asset-browser-grid-view' into file-browser-grid-view
Diffstat (limited to 'source/blender/makesrna/intern/rna_image_api.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_image_api.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/makesrna/intern/rna_image_api.c b/source/blender/makesrna/intern/rna_image_api.c index bac8f214441..be1e344d73f 100644 --- a/source/blender/makesrna/intern/rna_image_api.c +++ b/source/blender/makesrna/intern/rna_image_api.c @@ -59,9 +59,8 @@ static void rna_Image_save_render( ImageSaveOptions opts; - if (BKE_image_save_options_init(&opts, bmain, scene, image, NULL, false)) { + if (BKE_image_save_options_init(&opts, bmain, scene, image, NULL, false, true)) { opts.save_copy = true; - opts.save_as_render = true; STRNCPY(opts.filepath, path); if (!BKE_image_save(reports, bmain, image, NULL, &opts)) { @@ -83,7 +82,7 @@ static void rna_Image_save(Image *image, Main *bmain, bContext *C, ReportList *r Scene *scene = CTX_data_scene(C); ImageSaveOptions opts; - if (BKE_image_save_options_init(&opts, bmain, scene, image, NULL, false)) { + if (BKE_image_save_options_init(&opts, bmain, scene, image, NULL, false, false)) { if (!BKE_image_save(reports, bmain, image, NULL, &opts)) { BKE_reportf(reports, RPT_ERROR, @@ -165,7 +164,10 @@ static void rna_Image_scale(Image *image, ReportList *reports, int width, int he { if (!BKE_image_scale(image, width, height)) { BKE_reportf(reports, RPT_ERROR, "Image '%s' does not have any image data", image->id.name + 2); + return; } + BKE_image_partial_update_mark_full_update(image); + WM_main_add_notifier(NC_IMAGE | NA_EDITED, image); } static int rna_Image_gl_load( |