archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Campbell Barton
2017-06-02 15:39:25 +10:00
parent cb23927c9b 0d8bf4bf94
commit eae486f5e6
19 changed files with 49 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/gpu/shaders/gpu_shader_material.glsl
View File

@@ -3112,10 +3112,10 @@ vec2 calc_brick_texture(vec3 p, float mortar_size, float mortar_smooth, float bi
float tint = clamp((integer_noise((rownum << 16) + (bricknum & 0xFFFF)) + bias), 0.0, 1.0);
float min_dist = min(min(x, y), min(brick_width - x, row_height - y));
if(min_dist >= mortar_size) {
if (min_dist >= mortar_size) {
return vec2(tint, 0.0);
}
else if(mortar_smooth == 0.0) {
else if (mortar_smooth == 0.0) {
return vec2(tint, 1.0);
}
else {