Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2016-05-22 17:47:06 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2016-05-22 17:47:06 +0300
commit841d008b98de5d0fa106ff3fa4731be63fc29f9a (patch)
treec02de6bc9cc1de4035dc8c07dc34227841b6aa0f /source/blender/gpu
parent309f26014b6beb5aaebc0ddc51396647141d417a (diff)
Fix missing Ignore option for GLSL bump
Diffstat (limited to 'source/blender/gpu')
-rw-r--r--source/blender/gpu/shaders/gpu_shader_material.glsl5
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/gpu/shaders/gpu_shader_material.glsl b/source/blender/gpu/shaders/gpu_shader_material.glsl
index 28bf99b83dc..e97dddfd00f 100644
--- a/source/blender/gpu/shaders/gpu_shader_material.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_material.glsl
@@ -3160,8 +3160,11 @@ void node_normal_map(vec4 tangent, vec3 normal, vec3 texnormal, out vec3 outnorm
outnormal = normalize(outnormal);
}
-void node_bump(float strength, float dist, float height, vec3 N, vec3 surf_pos, out vec3 result)
+void node_bump(float strength, float dist, float height, vec3 N, vec3 surf_pos, float invert, out vec3 result)
{
+ if (invert != 0.0) {
+ dist *= -1.0;
+ }
vec3 dPdx = dFdx(surf_pos);
vec3 dPdy = dFdy(surf_pos);