Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Dinges <blender@dingto.org>2013-08-11 20:55:24 +0400
committerThomas Dinges <blender@dingto.org>2013-08-11 20:55:24 +0400
commit9dfd2823c492d78bca532226f978a85728f6f3cc (patch)
tree661b65e11149ed44f5a17aff49af9d5d4417fc10 /intern/cycles/kernel/shaders/node_texture.h
parent33686720f2313944d895e543c0fa306eaa9fe9c4 (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/shaders/node_texture.h')
-rw-r--r--intern/cycles/kernel/shaders/node_texture.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/intern/cycles/kernel/shaders/node_texture.h b/intern/cycles/kernel/shaders/node_texture.h
index e7801c0aba2..3997803ec08 100644
--- a/intern/cycles/kernel/shaders/node_texture.h
+++ b/intern/cycles/kernel/shaders/node_texture.h
@@ -18,8 +18,11 @@
float voronoi_distance(string distance_metric, vector d, float e)
{
+#if 0
if (distance_metric == "Distance Squared")
+#endif
return dot(d, d);
+#if 0
if (distance_metric == "Actual Distance")
return length(d);
if (distance_metric == "Manhattan")
@@ -34,6 +37,7 @@ float voronoi_distance(string distance_metric, vector d, float e)
return pow(pow(fabs(d[0]), e) + pow(fabs(d[1]), e) + pow(fabs(d[2]), e), 1.0 / e);
return 0.0;
+#endif
}
/* Voronoi / Worley like */