[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43327] trunk/blender/intern/cycles/kernel /svm/svm_musgrave.h: Fix #29860: cycles musgrave scale input not working correct.

Brecht Van Lommel brechtvanlommel at pandora.be
Thu Jan 12 18:13:59 CET 2012


Revision: 43327
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43327
Author:   blendix
Date:     2012-01-12 17:13:56 +0000 (Thu, 12 Jan 2012)
Log Message:
-----------
Fix #29860: cycles musgrave scale input not working correct.

Modified Paths:
--------------
    trunk/blender/intern/cycles/kernel/svm/svm_musgrave.h

Modified: trunk/blender/intern/cycles/kernel/svm/svm_musgrave.h
===================================================================
--- trunk/blender/intern/cycles/kernel/svm/svm_musgrave.h	2012-01-12 17:05:13 UTC (rev 43326)
+++ trunk/blender/intern/cycles/kernel/svm/svm_musgrave.h	2012-01-12 17:13:56 UTC (rev 43327)
@@ -213,7 +213,7 @@
 
 	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);



More information about the Bf-blender-cvs mailing list