[Bf-blender-cvs] [cf6c8ae01b6] blender-v3.2-release: Fix T98573: Rescaling Image by python wrong
Philipp Oeser
noreply at git.blender.org
Fri Jun 3 14:10:50 CEST 2022
Commit: cf6c8ae01b66a6260604e35c9c2d63bb06805e4f
Author: Philipp Oeser
Date: Fri Jun 3 12:50:13 2022 +0200
Branches: blender-v3.2-release
https://developer.blender.org/rBcf6c8ae01b66a6260604e35c9c2d63bb06805e4f
Fix T98573: Rescaling Image by python wrong
This did not refresh the Image editor, but more importantly this now
appeared cropped (a regression from the partial image updater).
Solved in the RNA function by:
- calling BKE_image_partial_update_mark_full_update
- sending appropriate notifier
Maniphest Tasks: T98573
Differential Revision: https://developer.blender.org/D15110
===================================================================
M source/blender/makesrna/intern/rna_image_api.c
===================================================================
diff --git a/source/blender/makesrna/intern/rna_image_api.c b/source/blender/makesrna/intern/rna_image_api.c
index 29f639fbe65..f46b820a9f9 100644
--- a/source/blender/makesrna/intern/rna_image_api.c
+++ b/source/blender/makesrna/intern/rna_image_api.c
@@ -197,11 +197,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(
@@ -318,7 +322,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);
More information about the Bf-blender-cvs
mailing list