forked from bartvdbraak/blender
Cleanup: Simplify brick texture code a bit.
This commit is contained in:
parent
249f2b9ccf
commit
97422ea64f
@ -87,10 +87,7 @@ shader node_brick_texture(
|
||||
|
||||
if (Fac != 1.0) {
|
||||
float facm = 1.0 - tint;
|
||||
|
||||
Col[0] = facm * (Color1[0]) + tint * Color2[0];
|
||||
Col[1] = facm * (Color1[1]) + tint * Color2[1];
|
||||
Col[2] = facm * (Color1[2]) + tint * Color2[2];
|
||||
Col = facm * Color1 + tint * Color2;
|
||||
}
|
||||
|
||||
Color = (Fac == 1.0) ? Mortar : Col;
|
||||
|
@ -95,10 +95,7 @@ ccl_device void svm_node_tex_brick(KernelGlobals *kg, ShaderData *sd, float *sta
|
||||
|
||||
if(f != 1.0f) {
|
||||
float facm = 1.0f - tint;
|
||||
|
||||
color1.x = facm * (color1.x) + tint * color2.x;
|
||||
color1.y = facm * (color1.y) + tint * color2.y;
|
||||
color1.z = facm * (color1.z) + tint * color2.z;
|
||||
color1 = facm * color1 + tint * color2;
|
||||
}
|
||||
|
||||
if(stack_valid(color_offset))
|
||||
|
Loading…
Reference in New Issue
Block a user