diff options
author | Philipp Oeser <info@graphics-engineer.com> | 2022-06-03 15:11:48 +0300 |
---|---|---|
committer | Philipp Oeser <info@graphics-engineer.com> | 2022-06-03 15:11:48 +0300 |
commit | fa5cf5360cbb93c7e607c8c616f3fffa28243359 (patch) | |
tree | 3b378c01c66e16f7ccf152a80142f788e5fd389a /source | |
parent | 6b84465352edebcc204d578221501073b7fa06d1 (diff) | |
parent | cf6c8ae01b66a6260604e35c9c2d63bb06805e4f (diff) |
Merge branch 'blender-v3.2-release'
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/makesrna/intern/rna_image_api.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/source/blender/makesrna/intern/rna_image_api.c b/source/blender/makesrna/intern/rna_image_api.c index 46bb0df5c11..d2b8b32eedc 100644 --- a/source/blender/makesrna/intern/rna_image_api.c +++ b/source/blender/makesrna/intern/rna_image_api.c @@ -160,11 +160,15 @@ static void rna_Image_update(Image *image, ReportList *reports) BKE_image_release_ibuf(image, ibuf, NULL); } -static void rna_Image_scale(Image *image, ReportList *reports, int width, int height) +static void rna_Image_scale(Image *image, bContext *C, ReportList *reports, int width, int height) { if (!BKE_image_scale(image, width, height)) { BKE_reportf(reports, RPT_ERROR, "Image '%s' does not have any image data", image->id.name + 2); } + else { + BKE_image_partial_update_mark_full_update(image); + WM_event_add_notifier(C, NC_IMAGE | NA_EDITED, image); + } } static int rna_Image_gl_load( @@ -281,7 +285,7 @@ void RNA_api_image(StructRNA *srna) func = RNA_def_function(srna, "scale", "rna_Image_scale"); RNA_def_function_ui_description(func, "Scale the buffer of the image, in pixels"); - RNA_def_function_flag(func, FUNC_USE_REPORTS); + RNA_def_function_flag(func, FUNC_USE_REPORTS | FUNC_USE_CONTEXT); parm = RNA_def_int(func, "width", 1, 1, INT_MAX, "", "Width", 1, INT_MAX); RNA_def_parameter_flags(parm, 0, PARM_REQUIRED); parm = RNA_def_int(func, "height", 1, 1, INT_MAX, "", "Height", 1, INT_MAX); |