Revision: 36688 http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36688 Author: blendix Date: 2011-05-14 13:23:15 +0000 (Sat, 14 May 2011) Log Message: ----------- Cycles: fix chained mix/add closures nodes not working.
Modified Paths: -------------- branches/cycles/intern/cycles/kernel/svm/svm_closure.h Modified: branches/cycles/intern/cycles/kernel/svm/svm_closure.h =================================================================== --- branches/cycles/intern/cycles/kernel/svm/svm_closure.h 2011-05-14 12:32:15 UTC (rev 36687) +++ branches/cycles/intern/cycles/kernel/svm/svm_closure.h 2011-05-14 13:23:15 UTC (rev 36688) @@ -183,10 +183,10 @@ offset from the current node, so we jump */ if(*randb < weight) { *offset += node_jump; - *randb = (*randb - weight)/(1.0f - weight); + *randb = *randb/weight; } else - *randb = *randb/weight; + *randb = (*randb - weight)/(1.0f - weight); } __device void svm_node_add_closure(ShaderData *sd, float *stack, uint unused, @@ -199,10 +199,10 @@ of the two closures being added */ if(*randb < weight) { *offset += node_jump; - *randb = (*randb - weight)/(1.0f - weight); + *randb = *randb/weight; } else - *randb = *randb/weight; + *randb = (*randb - weight)/(1.0f - weight); *closure_weight *= 2.0f; } _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs