diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-04-24 09:01:21 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-04-24 09:01:21 +0300 |
| commit | 4b544e857c94118ff3957d7fa15758507fd94181 (patch) | |
| tree | 2ec6346fa3c0b7c5a0d4a2af7d9e5694a1a1ef85 /source/blender/blenlib | |
| parent | c1b310c32bd08e68d6bb568cf33c2731c0f884c0 (diff) | |
| parent | 92f36586e30931cf796835fd52d4691dbedfaf9d (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenlib')
| -rw-r--r-- | source/blender/blenlib/intern/bitmap_draw_2d.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenlib/intern/bitmap_draw_2d.c b/source/blender/blenlib/intern/bitmap_draw_2d.c index ff62d78796b..f2ec75001b4 100644 --- a/source/blender/blenlib/intern/bitmap_draw_2d.c +++ b/source/blender/blenlib/intern/bitmap_draw_2d.c @@ -240,7 +240,7 @@ void BLI_bitmap_draw_2d_tri_v2i( float inv_slope1 = inv_slope(p2, p1); float inv_slope2 = inv_slope(p3, p1); ORDER_VARS2(float, inv_slope1, inv_slope2); - BLI_assert(inv_slope1 <= inv_slope2); + BLI_assert(!(inv_slope1 > inv_slope2)); draw_tri_flat_max( p1, p2[1], inv_slope1, inv_slope2, @@ -251,7 +251,7 @@ void BLI_bitmap_draw_2d_tri_v2i( float inv_slope1 = inv_slope(p3, p1); float inv_slope2 = inv_slope(p3, p2); ORDER_VARS2(float, inv_slope2, inv_slope1); - BLI_assert(inv_slope1 >= inv_slope2); + BLI_assert(!(inv_slope1 < inv_slope2)); draw_tri_flat_min( p3, p2[1] + 1, /* avoid overlap */ inv_slope1, inv_slope2, |