diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-09-13 16:44:13 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-09-13 16:44:13 +0300 |
| commit | 37d8d4787cfa3d04b09f935c5600f1a3ea7b74e7 (patch) | |
| tree | b60dfc428ccd61b5b3af6a06cee6ddbe69d3973e /source/blender/render | |
| parent | 9abacf38fd4f3b0de4b6d9a4644b9cb1155482c9 (diff) | |
| parent | 6f633dec5d105ad91dcb5774a6fd4fb06bf264a5 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/source/zbuf.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/source/blender/render/intern/source/zbuf.c b/source/blender/render/intern/source/zbuf.c index 68707f163af..0b6d31ef902 100644 --- a/source/blender/render/intern/source/zbuf.c +++ b/source/blender/render/intern/source/zbuf.c @@ -1564,20 +1564,13 @@ void zspan_scanconvert(ZSpan *zspan, void *handle, float *v1, float *v2, float * vy0= ((double)my2)*vyd + (double)xx1; /* correct span */ - sn1= (my0 + my2)/2; - if (zspan->span1[sn1] < zspan->span2[sn1]) { - span1= zspan->span1+my2; - span2= zspan->span2+my2; - } - else { - span1= zspan->span2+my2; - span2= zspan->span1+my2; - } + span1= zspan->span1+my2; + span2= zspan->span2+my2; for (i = 0, y = my2; y >= my0; i++, y--, span1--, span2--) { - sn1= floor(*span1); - sn2= floor(*span2); + sn1= floor(min_ff(*span1, *span2)); + sn2= floor(max_ff(*span1, *span2)); sn1++; if (sn2>=rectx) sn2= rectx-1; |