diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2021-01-29 19:09:58 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2021-01-29 19:09:58 +0300 |
| commit | 171f2e4949837ca3537d9b998a42590fd88c5ad8 (patch) | |
| tree | fa80407c434b0497169ca3c90ba3e7426390b853 /source/blender/nodes | |
| parent | c7d75a66163635ec7629eda2d4aa39b9e197ef6a (diff) | |
| parent | 5d215d522541e32b9e33e92f836d2cf8eb6080c2 (diff) | |
Merge branch 'blender-v2.92-release'
Diffstat (limited to 'source/blender/nodes')
| -rw-r--r-- | source/blender/nodes/shader/nodes/node_shader_displacement.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/nodes/shader/nodes/node_shader_displacement.c b/source/blender/nodes/shader/nodes/node_shader_displacement.c index 649aad370c0..e7deef23428 100644 --- a/source/blender/nodes/shader/nodes/node_shader_displacement.c +++ b/source/blender/nodes/shader/nodes/node_shader_displacement.c @@ -65,8 +65,7 @@ static int gpu_shader_displacement(GPUMaterial *mat, mat, node, "node_displacement_object", in, out, GPU_builtin(GPU_OBJECT_MATRIX)); } - return GPU_stack_link( - mat, node, "node_displacement_world", in, out, GPU_builtin(GPU_OBJECT_MATRIX)); + return GPU_stack_link(mat, node, "node_displacement_world", in, out); } /* node type definition */ |