diff options
| author | Lukas Stockner <lukas.stockner@freenet.de> | 2016-10-30 18:25:35 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-01-20 13:25:28 +0300 |
| commit | 927f84af075a8e12e3266dc075bd3239aa033023 (patch) | |
| tree | bc4015b2f39491dc030585a48b887d3440a8c247 /intern/cycles/kernel/svm | |
| parent | 44197cafaf9c3971cbf42f7b0a6ada403842f2a9 (diff) | |
Cycles: Fix OpenCL compilation with the new brick texture
Diffstat (limited to 'intern/cycles/kernel/svm')
| -rw-r--r-- | intern/cycles/kernel/svm/svm_brick.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/kernel/svm/svm_brick.h b/intern/cycles/kernel/svm/svm_brick.h index 47e1ba2ba6b..14245cf0522 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); } |