diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-05-25 11:04:25 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-05-25 11:04:25 +0300 |
| commit | ef22d2e8adb9965cd3cb91e733d4b9754cf6024f (patch) | |
| tree | 1d95a52cd619be4b9974c6aa2f197373a1831912 /source/blender/gpu/shaders | |
| parent | 2a6e4f71576ebee19f34fd5f7c214fd2e9f060f8 (diff) | |
| parent | d02335a1950c81fffea815f31e47bca92ab7d33c (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/gpu/shaders')
| -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 4306fe17e96..a6bfb09141c 100644 --- a/source/blender/gpu/shaders/gpu_shader_material.glsl +++ b/source/blender/gpu/shaders/gpu_shader_material.glsl @@ -396,6 +396,11 @@ void math_abs(float val1, out float outval) outval = abs(val1); } +void math_atan2(float val1, float val2, out float outval) +{ + outval = atan(val1, val2); +} + void squeeze(float val, float width, float center, out float outval) { outval = 1.0 / (1.0 + pow(2.71828183, -((val - center) * width))); |