diff options
| author | Thomas Dinges <blender@dingto.org> | 2014-01-13 23:40:13 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2014-01-14 00:17:55 +0400 |
| commit | 6b61f7f755011c0ceea89a31be218e1ed4940414 (patch) | |
| tree | 3bd475deb2184546cd44aae02bd917fc14f5aaae /intern/cycles/kernel/svm/svm_musgrave.h | |
| parent | ef67b9eec4edbeec8d21fa6db798cd6ef68ab344 (diff) | |
Code cleanup / Cycles: Don't pass scale to texture functions, do the multiplication in the function call already.
Diffstat (limited to 'intern/cycles/kernel/svm/svm_musgrave.h')
| -rw-r--r-- | intern/cycles/kernel/svm/svm_musgrave.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/intern/cycles/kernel/svm/svm_musgrave.h b/intern/cycles/kernel/svm/svm_musgrave.h index c67dc8297e4..61171d6849c 100644 --- a/intern/cycles/kernel/svm/svm_musgrave.h +++ b/intern/cycles/kernel/svm/svm_musgrave.h @@ -181,10 +181,9 @@ ccl_device_noinline float noise_musgrave_ridged_multi_fractal(float3 p, NodeNois /* Shader */ -ccl_device float svm_musgrave(NodeMusgraveType type, float dimension, float lacunarity, float octaves, float offset, float intensity, float gain, float scale, float3 p) +ccl_device float svm_musgrave(NodeMusgraveType type, float dimension, float lacunarity, float octaves, float offset, float intensity, float gain, float3 p) { NodeNoiseBasis basis = NODE_NOISE_PERLIN; - p *= scale; if(type == NODE_MUSGRAVE_MULTIFRACTAL) return intensity*noise_musgrave_multi_fractal(p, basis, dimension, lacunarity, octaves); @@ -226,7 +225,7 @@ ccl_device void svm_node_tex_musgrave(KernelGlobals *kg, ShaderData *sd, float * lacunarity = fmaxf(lacunarity, 1e-5f); float f = svm_musgrave((NodeMusgraveType)type, - dimension, lacunarity, detail, foffset, 1.0f, gain, scale, co); + dimension, lacunarity, detail, foffset, 1.0f, gain, co*scale); if(stack_valid(fac_offset)) stack_store_float(stack, fac_offset, f); |