diff options
author | Antony Riakiotakis <kalast@gmail.com> | 2014-07-24 17:18:49 +0400 |
---|---|---|
committer | Antony Riakiotakis <kalast@gmail.com> | 2014-07-24 17:18:49 +0400 |
commit | 36b6b691733c7c1683d0326a3b0ba80e98b221ff (patch) | |
tree | 07253ddb156bba11bf143849b4f4fdd66801bd60 /source/blender/editors/sculpt_paint/paint_image_2d.c | |
parent | b7b1c09766a120cdb1f66a40a93590c2dcfe1120 (diff) |
Fixes:
* Crash with image drag'n'drop
* Drag'n drop color to paint 2d canvas not working
* Change "Layers" to "Slots" to appease purists.
Diffstat (limited to 'source/blender/editors/sculpt_paint/paint_image_2d.c')
-rw-r--r-- | source/blender/editors/sculpt_paint/paint_image_2d.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_image_2d.c b/source/blender/editors/sculpt_paint/paint_image_2d.c index d394d6d3f63..affe69b719d 100644 --- a/source/blender/editors/sculpt_paint/paint_image_2d.c +++ b/source/blender/editors/sculpt_paint/paint_image_2d.c @@ -1392,7 +1392,7 @@ void paint_2d_bucket_fill( ED_imapaint_dirty_region(ima, ibuf, 0, 0, ibuf->x, ibuf->y); if (do_float) { - for (; x_px < ibuf->x; x_px++) { + for (x_px = 0; x_px < ibuf->x; x_px++) { for (y_px = 0; y_px < ibuf->y; y_px++) { blend_color_mix_float(ibuf->rect_float + 4 * (y_px * ibuf->x + x_px), ibuf->rect_float + 4 * (y_px * ibuf->x + x_px), color_f); @@ -1400,7 +1400,7 @@ void paint_2d_bucket_fill( } } else { - for (; x_px < ibuf->x; x_px++) { + for (x_px = 0; x_px < ibuf->x; x_px++) { for (y_px = 0; y_px < ibuf->y; y_px++) { blend_color_mix_byte((unsigned char *)(ibuf->rect + y_px * ibuf->x + x_px), (unsigned char *)(ibuf->rect + y_px * ibuf->x + x_px), (unsigned char *)&color_b); |