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:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2012-01-12 21:13:56 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2012-01-12 21:13:56 +0400
commitb20a56b2caa25b06c33e0aa85f17b0b5a9145b5e (patch)
tree4bef56de7141cf71a339ea509836594c8c0723eb /intern/cycles/kernel/svm/svm_musgrave.h
parent34b62dd8c07fd45ba902c6d5bfb27d070e4c2688 (diff)
Fix #29860: cycles musgrave scale input not working correct.
Diffstat (limited to 'intern/cycles/kernel/svm/svm_musgrave.h')
-rw-r--r--intern/cycles/kernel/svm/svm_musgrave.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/kernel/svm/svm_musgrave.h b/intern/cycles/kernel/svm/svm_musgrave.h
index 34cf7868f07..9444dc20e6e 100644
--- a/intern/cycles/kernel/svm/svm_musgrave.h
+++ b/intern/cycles/kernel/svm/svm_musgrave.h
@@ -213,7 +213,7 @@ __device void svm_node_tex_musgrave(KernelGlobals *kg, ShaderData *sd, float *st
decode_node_uchar4(node.y, &type, &co_offset, &color_offset, &fac_offset);
decode_node_uchar4(node.z, &dimension_offset, &lacunarity_offset, &detail_offset, &offset_offset);
- decode_node_uchar4(node.z, &gain_offset, &scale_offset, NULL, NULL);
+ decode_node_uchar4(node.w, &gain_offset, &scale_offset, NULL, NULL);
float3 co = stack_load_float3(stack, co_offset);
float dimension = stack_load_float_default(stack, dimension_offset, node2.x);