diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-07-20 20:07:35 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-07-20 20:10:45 +0300 |
| commit | a6f750dd4148b1c2549150128ee0c21db30039b6 (patch) | |
| tree | 8cebd0c6f48a105968d7f3c0e427235631d5ca70 /intern/cycles/kernel/svm | |
| parent | 710a05954990c347932b9f540a1b220ea2c5c0da (diff) | |
Fix T54455, T56053, T55564: Cycles OpenCL build error after recent changes.
Diffstat (limited to 'intern/cycles/kernel/svm')
| -rw-r--r-- | intern/cycles/kernel/svm/svm_voronoi.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/intern/cycles/kernel/svm/svm_voronoi.h b/intern/cycles/kernel/svm/svm_voronoi.h index e5e350bf76a..75af910d940 100644 --- a/intern/cycles/kernel/svm/svm_voronoi.h +++ b/intern/cycles/kernel/svm/svm_voronoi.h @@ -52,7 +52,7 @@ ccl_device void voronoi_neighbors(float3 p, NodeVoronoiDistanceMetric distance, case NODE_VORONOI_CHEBYCHEV: d = max3(fabs(vp - p)); break; - case NODE_VORONOI_MINKOWSKI: + case NODE_VORONOI_MINKOWSKI: { float3 n = fabs(vp - p); if(e == 0.5f) { d = sqr(reduce_add(sqrt(n))); @@ -61,6 +61,7 @@ ccl_device void voronoi_neighbors(float3 p, NodeVoronoiDistanceMetric distance, d = powf(reduce_add(pow3(n, e)), 1.0f/e); } break; + } } /* To keep the shortest four distances and associated points we have to keep them in sorted order. */ |