griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into blender2.8

Browse Source
This commit is contained in:
Ray Molenkamp
2018-07-22 16:03:46 -06:00
parent f07140940c 7232b0cbe5
commit cdce3b71df
4 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
intern/cycles/kernel/svm/svm_voronoi.h
View File

@@ -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. */