[Bf-blender-cvs] [2e9dd12] master: Cycles: Fix OpenCL compilation with the new brick texture

[Lukas Stockner]

Commit: 2e9dd1200f76818ee385e0c16831c5e8607ad186
Author: Lukas Stockner
Date:   Sun Oct 30 16:25:35 2016 +0100
Branches: master
https://developer.blender.org/rB2e9dd1200f76818ee385e0c16831c5e8607ad186

Cycles: Fix OpenCL compilation with the new brick texture

===================================================================

M       intern/cycles/kernel/svm/svm_brick.h

===================================================================

diff --git a/intern/cycles/kernel/svm/svm_brick.h 
b/intern/cycles/kernel/svm/svm_brick.h
index 47e1ba2..14245cf 100644
--- a/intern/cycles/kernel/svm/svm_brick.h
+++ b/intern/cycles/kernel/svm/svm_brick.h
@@ -112,7 +112,7 @@ ccl_device void svm_node_tex_brick(KernelGlobals *kg, 
ShaderData *sd, float *sta
        }
 
        if(stack_valid(color_offset))
-               stack_store_float3(stack, color_offset, lerp(color1, mortar, 
f));
+               stack_store_float3(stack, color_offset, color1*(1.0f-f) + 
mortar*f);
        if(stack_valid(fac_offset))
                stack_store_float(stack, fac_offset, f);
 }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs