From bb1e794d5800b450b53161e9cd9a682c2d6816b1 Mon Sep 17 00:00:00 2001 From: Robert Guetzkow Date: Mon, 27 Apr 2020 16:43:35 +1000 Subject: Fix T72476: Crash when drag & drop Color in the Image Editor --- source/blender/editors/sculpt_paint/paint_image.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'source/blender/editors/sculpt_paint/paint_image.c') diff --git a/source/blender/editors/sculpt_paint/paint_image.c b/source/blender/editors/sculpt_paint/paint_image.c index 1a2b44a03b4..d913bc2e242 100644 --- a/source/blender/editors/sculpt_paint/paint_image.c +++ b/source/blender/editors/sculpt_paint/paint_image.c @@ -1305,20 +1305,20 @@ void ED_imapaint_bucket_fill(struct bContext *C, wmOperator *op, const int mouse[2]) { - wmWindowManager *wm = CTX_wm_manager(C); SpaceImage *sima = CTX_wm_space_image(C); - Image *ima = sima->image; - BKE_undosys_step_push_init_with_type(wm->undo_stack, C, op->type->name, BKE_UNDOSYS_TYPE_IMAGE); + if (sima && sima->image) { + Image *ima = sima->image; - ED_image_undo_push_begin(op->type->name, PAINT_MODE_TEXTURE_2D); + ED_image_undo_push_begin(op->type->name, PAINT_MODE_TEXTURE_2D); - float mouse_init[2] = {mouse[0], mouse[1]}; - paint_2d_bucket_fill(C, color, NULL, mouse_init, NULL, NULL); + float mouse_init[2] = {mouse[0], mouse[1]}; + paint_2d_bucket_fill(C, color, NULL, mouse_init, NULL, NULL); - BKE_undosys_step_push(wm->undo_stack, C, op->type->name); + ED_image_undo_push_end(); - DEG_id_tag_update(&ima->id, 0); + DEG_id_tag_update(&ima->id, 0); + } } static bool texture_paint_poll(bContext *C) -- cgit v1.2.3