Cycles / OSL:

* More small improvements: return immediately, and use "else if".

1 files changed, 14 insertions, 16 deletions

diff --git a/intern/cycles/kernel/shaders/node_texture.h b/intern/cycles/kernel/shaders/node_texture.h
index 67735487b89..f2aedb098d4 100644
--- a/intern/cycles/kernel/shaders/node_texture.h
+++ b/intern/cycles/kernel/shaders/node_texture.h
@@ -18,24 +18,22 @@
 
 float voronoi_distance(string distance_metric, vector d, float e)
 {
-	float result = 0.0;
-
 	if (distance_metric == "Distance Squared")
-		result = dot(d, d);
+		return dot(d, d);
 	if (distance_metric == "Actual Distance")
-		result = length(d);
+		return length(d);
 	if (distance_metric == "Manhattan")
-		result = fabs(d[0]) + fabs(d[1]) + fabs(d[2]);
+		return fabs(d[0]) + fabs(d[1]) + fabs(d[2]);
 	if (distance_metric == "Chebychev")
-		result = max(fabs(d[0]), max(fabs(d[1]), fabs(d[2])));
+		return max(fabs(d[0]), max(fabs(d[1]), fabs(d[2])));
 	if (distance_metric == "Minkovsky 1/2")
-		result = sqrt(fabs(d[0])) + sqrt(fabs(d[1])) + sqrt(fabs(d[1]));
+		return sqrt(fabs(d[0])) + sqrt(fabs(d[1])) + sqrt(fabs(d[1]));
 	if (distance_metric == "Minkovsky 4")
-		result = sqrt(sqrt(dot(d * d, d * d)));
+		return sqrt(sqrt(dot(d * d, d * d)));
 	if (distance_metric == "Minkovsky")
-		result = pow(pow(fabs(d[0]), e) + pow(fabs(d[1]), e) + pow(fabs(d[2]), e), 1.0 / e);
+		return pow(pow(fabs(d[0]), e) + pow(fabs(d[1]), e) + pow(fabs(d[2]), e), 1.0 / e);
 	
-	return result;
+	return 0.0;
 }
 
 /* Voronoi / Worley like */
@@ -207,24 +205,24 @@ float noise_wave(string wave, float a)
 	float result = 0.0;
 
 	if (wave == "Sine") {
-		result = 0.5 + 0.5 * sin(a);
+		return 0.5 + 0.5 * sin(a);
 	}
-	else if (wave == "Saw") {
+	if (wave == "Saw") {
 		float b = 2 * M_PI;
 		int n = (int)(a / b);
 		a -= n * b;
 		if (a < 0) a += b;
 
-		result = a / b;
+		return a / b;
 	}
-	else if (wave == "Tri") {
+	if (wave == "Tri") {
 		float b = 2 * M_PI;
 		float rmax = 1.0;
 
-		result = rmax - 2.0 * fabs(floor((a * (1.0 / b)) + 0.5) - (a * (1.0 / b)));
+		return rmax - 2.0 * fabs(floor((a * (1.0 / b)) + 0.5) - (a * (1.0 / b)));
 	}
 
-	return result;
+	return 0.0;
 }
 
 /* Turbulence */