diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-17 18:10:19 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-17 18:10:19 +0300 |
| commit | 06a1a66a9b6f120867d3bbebe3928744ec8e3495 (patch) | |
| tree | 42e827a3cf58eb76474e479206b02a8d97dd3bf7 /source/blender/imbuf/intern/thumbs_blend.c | |
| parent | 61d27db35967710421ab92748e09624db068258d (diff) | |
| parent | a24b4e6090057479796e914bc603119b12f6ca06 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/imbuf/intern/thumbs_blend.c')
| -rw-r--r-- | source/blender/imbuf/intern/thumbs_blend.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/imbuf/intern/thumbs_blend.c b/source/blender/imbuf/intern/thumbs_blend.c index 7ed725ae163..9cf1b96635b 100644 --- a/source/blender/imbuf/intern/thumbs_blend.c +++ b/source/blender/imbuf/intern/thumbs_blend.c @@ -145,7 +145,7 @@ void IMB_thumb_overlay_blend(unsigned int *thumb, int width, int height, float a { int x, y; int stride_x = (margin_r - margin_l) - 2; - + for (y = 0; y < height; y++) { for (x = 0; x < width; x++, px += 4) { int hline = 0, vline = 0; |