Code cleanup / Cycles: Don't pass scale to texture functions, do the multiplication in the function call already.

1 files changed, 2 insertions, 4 deletions

diff --git a/intern/cycles/kernel/svm/svm_noisetex.h b/intern/cycles/kernel/svm/svm_noisetex.h
index 02583131704..5d5cfe6ffcc 100644
--- a/intern/cycles/kernel/svm/svm_noisetex.h
+++ b/intern/cycles/kernel/svm/svm_noisetex.h
@@ -18,13 +18,11 @@ CCL_NAMESPACE_BEGIN
 
 /* Noise */
 
-ccl_device_inline void svm_noise(float3 p, float scale, float detail, float distortion, float *fac, float3 *color)
+ccl_device_inline void svm_noise(float3 p, float detail, float distortion, float *fac, float3 *color)
 {
 	NodeNoiseBasis basis = NODE_NOISE_PERLIN;
 	int hard = 0;
 
-	p *= scale;
-
 	if(distortion != 0.0f) {
 		float3 r, offset = make_float3(13.5f, 13.5f, 13.5f);
 
@@ -57,7 +55,7 @@ ccl_device void svm_node_tex_noise(KernelGlobals *kg, ShaderData *sd, float *sta
 	float3 color;
 	float f;
 
-	svm_noise(co, scale, detail, distortion, &f, &color);
+	svm_noise(co*scale, detail, distortion, &f, &color);
 
 	decode_node_uchar4(node.z, &color_offset, &fac_offset, NULL, NULL);