diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-02-15 10:05:02 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-02-15 10:05:02 +0300 |
| commit | ca7f826c6f1812d38cd3a6985b5fc8de6e9de78c (patch) | |
| tree | 878cdf3252cf23c3ef519aaf98e4a4a8d6770724 /source/blender/nodes | |
| parent | b8b8669b282da70f4db2a89203adee014a98b204 (diff) | |
| parent | 58ba89b5bec5a2b7b74ef93fe18f0a3811cb48db (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/nodes')
| -rw-r--r-- | source/blender/nodes/shader/nodes/node_shader_displacement.c | 2 | ||||
| -rw-r--r-- | source/blender/nodes/shader/nodes/node_shader_vector_displacement.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/nodes/shader/nodes/node_shader_displacement.c b/source/blender/nodes/shader/nodes/node_shader_displacement.c index 25aee34f0ab..c26968e8d14 100644 --- a/source/blender/nodes/shader/nodes/node_shader_displacement.c +++ b/source/blender/nodes/shader/nodes/node_shader_displacement.c @@ -60,7 +60,7 @@ static int gpu_shader_displacement(GPUMaterial *mat, bNode *node, bNodeExecData GPU_link(mat, "direction_transform_m4v3", GPU_builtin(GPU_VIEW_NORMAL), GPU_builtin(GPU_INVERSE_VIEW_MATRIX), &in[3].link); } - if(node->custom1 == SHD_SPACE_OBJECT) { + if (node->custom1 == SHD_SPACE_OBJECT) { return GPU_stack_link(mat, node, "node_displacement_object", in, out, GPU_builtin(GPU_OBJECT_MATRIX)); } else { diff --git a/source/blender/nodes/shader/nodes/node_shader_vector_displacement.c b/source/blender/nodes/shader/nodes/node_shader_vector_displacement.c index c864a606812..79b41509fcc 100644 --- a/source/blender/nodes/shader/nodes/node_shader_vector_displacement.c +++ b/source/blender/nodes/shader/nodes/node_shader_vector_displacement.c @@ -48,7 +48,7 @@ static void node_shader_init_vector_displacement(bNodeTree *UNUSED(ntree), bNode static int gpu_shader_vector_displacement(GPUMaterial *mat, bNode *node, bNodeExecData *UNUSED(execdata), GPUNodeStack *in, GPUNodeStack *out) { - if(node->custom1 == SHD_SPACE_TANGENT) { + if (node->custom1 == SHD_SPACE_TANGENT) { return GPU_stack_link(mat, node, "node_vector_displacement_tangent", @@ -59,7 +59,7 @@ static int gpu_shader_vector_displacement(GPUMaterial *mat, bNode *node, bNodeEx GPU_builtin(GPU_OBJECT_MATRIX), GPU_builtin(GPU_VIEW_MATRIX)); } - else if(node->custom1 == SHD_SPACE_OBJECT) { + else if (node->custom1 == SHD_SPACE_OBJECT) { return GPU_stack_link(mat, node, "node_vector_displacement_object", in, out, GPU_builtin(GPU_OBJECT_MATRIX)); } else { |