blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Fix T72476: Crash when drag & drop Color in the Image Editor

This commit is contained in:
Robert Guetzkow 2020-04-27 16:43:35 +10:00 committed by Campbell Barton
parent d0d16eb7d3
commit bb1e794d58
Notes: blender-bot 2023-02-14 04:40:22 +01:00 
Referenced by issue #72476, Assert Dragging & dropping color in the Image Editor (double UNDO push?)
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/editors/sculpt_paint/paint_image.c
View File

@ -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)

2
source/blender/editors/sculpt_paint/paint_image_2d.c
View File

@ -1894,7 +1894,7 @@ void paint_2d_bucket_fill(const bContext *C,
int x_px, y_px;
uint color_b;
float color_f[4];
float strength = br ? BKE_brush_alpha_get(s->scene, br) : 1.0f;
float strength = (s && br) ? BKE_brush_alpha_get(s->scene, br) : 1.0f;
bool do_float;