blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 748 Projects 19 Wiki Activity

Cycles: Fix OpenCL compilation with the new brick texture

This commit is contained in:
Lukas Stockner 2016-10-30 16:25:35 +01:00
parent 5050572e89
commit 2e9dd1200f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
intern/cycles/kernel/svm/svm_brick.h
View File

@ -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);
}