diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-11-08 02:20:59 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-11-08 02:20:59 +0300 |
| commit | 7b1d7074817dac9d0f088e8e7e5b336bae662c36 (patch) | |
| tree | 4ebd67459d2fc160d3a6c76a2509cefc68f4e89c /source/blender/gpu | |
| parent | 1b18e158025a488e1ba2446ad93c2eb563c11611 (diff) | |
| parent | a0478ebe379c8384376586e2880ebc813a6afef7 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/gpu')
| -rw-r--r-- | source/blender/gpu/shaders/gpu_shader_material.glsl | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/gpu/shaders/gpu_shader_material.glsl b/source/blender/gpu/shaders/gpu_shader_material.glsl index 44803f8f7ee..2cf66c78db1 100644 --- a/source/blender/gpu/shaders/gpu_shader_material.glsl +++ b/source/blender/gpu/shaders/gpu_shader_material.glsl @@ -4093,6 +4093,11 @@ void node_bump(float strength, float dist, float height, vec3 N, vec3 surf_pos, result = normalize(strength * result + (1.0 - strength) * N); } +void node_bevel(float radius, vec3 N, out vec3 result) +{ + result = N; +} + /* output */ void node_output_material(Closure surface, Closure volume, float displacement, out Closure result) |