diff options
| author | Thomas Dinges <blender@dingto.org> | 2013-08-11 20:55:24 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2013-08-11 20:55:24 +0400 |
| commit | 9dfd2823c492d78bca532226f978a85728f6f3cc (patch) | |
| tree | 661b65e11149ed44f5a17aff49af9d5d4417fc10 /intern/cycles/kernel/svm/svm_texture.h | |
| parent | 33686720f2313944d895e543c0fa306eaa9fe9c4 (diff) | |
Code cleanup / Cycles:
* Remove unused "PathThroughput" variable.
* Don't compile unused voronoi code, we only use Distance Squared atm.
* Various typo and comment fixes.
Diffstat (limited to 'intern/cycles/kernel/svm/svm_texture.h')
| -rw-r--r-- | intern/cycles/kernel/svm/svm_texture.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/intern/cycles/kernel/svm/svm_texture.h b/intern/cycles/kernel/svm/svm_texture.h index f735eb8acbe..02fb3e5b86e 100644 --- a/intern/cycles/kernel/svm/svm_texture.h +++ b/intern/cycles/kernel/svm/svm_texture.h @@ -22,8 +22,11 @@ CCL_NAMESPACE_BEGIN __device float voronoi_distance(NodeDistanceMetric distance_metric, float3 d, float e) { +#if 0 if(distance_metric == NODE_VORONOI_DISTANCE_SQUARED) +#endif return dot(d, d); +#if 0 if(distance_metric == NODE_VORONOI_ACTUAL_DISTANCE) return len(d); if(distance_metric == NODE_VORONOI_MANHATTAN) @@ -38,6 +41,7 @@ __device float voronoi_distance(NodeDistanceMetric distance_metric, float3 d, fl return powf(powf(fabsf(d.x), e) + powf(fabsf(d.y), e) + powf(fabsf(d.z), e), 1.0f/e); return 0.0f; +#endif } /* Voronoi / Worley like */ |