diff options
| author | Ralf Hölzemer <r.hoelzemer@googlemail.com> | 2016-05-23 16:12:52 +0300 |
|---|---|---|
| committer | Alexander Romanov <a.romanov@blend4web.com> | 2016-05-23 16:25:44 +0300 |
| commit | a6b218af2e62f5f0b37c05458072c7a4fb8ebf3d (patch) | |
| tree | 9e69caf3f6e26d20993b8384218afa0c750d3594 /source/blender/gpu/shaders | |
| parent | 66dceb2bedd2184f00a71513fa80fd56fc5f8ed2 (diff) | |
Enable correct GLSL output for cycles normalmap node
See T48453 for details and test scenes
Reviewers: a.romanov, sergey
Reviewed By: a.romanov, sergey
Projects: #opengl_gfx, #nodes
Differential Revision: https://developer.blender.org/D2011
Diffstat (limited to 'source/blender/gpu/shaders')
| -rw-r--r-- | source/blender/gpu/shaders/gpu_shader_material.glsl | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/source/blender/gpu/shaders/gpu_shader_material.glsl b/source/blender/gpu/shaders/gpu_shader_material.glsl index 9ac9bf020ed..a63e7b8dbf0 100644 --- a/source/blender/gpu/shaders/gpu_shader_material.glsl +++ b/source/blender/gpu/shaders/gpu_shader_material.glsl @@ -142,6 +142,20 @@ void color_to_normal(vec3 color, out vec3 normal) normal.z = 2.0 * ((color.b) - 0.5); } +void color_to_normal_new_shading(vec3 color, out vec3 normal) +{ + normal.x = 2.0 * ((color.r) - 0.5); + normal.y = 2.0 * ((color.g) - 0.5); + normal.z = 2.0 * ((color.b) - 0.5); +} + +void color_to_blender_normal_new_shading(vec3 color, out vec3 normal) +{ + normal.x = 2.0 * ((color.r) - 0.5); + normal.y = -2.0 * ((color.g) - 0.5); + normal.z = -2.0 * ((color.b) - 0.5); +} + #define M_PI 3.14159265358979323846 #define M_1_PI 0.31830988618379069 |