Commit: ca7f826c6f1812d38cd3a6985b5fc8de6e9de78c
Author: Campbell Barton
Date:   Thu Feb 15 18:05:02 2018 +1100
Branches: blender2.8
https://developer.blender.org/rBca7f826c6f1812d38cd3a6985b5fc8de6e9de78c

Merge branch 'master' into blender2.8

===================================================================



===================================================================

diff --cc source/blender/nodes/shader/nodes/node_shader_displacement.c
index 25aee34f0ab,e259a9e3f6d..c26968e8d14
--- a/source/blender/nodes/shader/nodes/node_shader_displacement.c
+++ b/source/blender/nodes/shader/nodes/node_shader_displacement.c
@@@ -60,11 -60,11 +60,11 @@@ static int gpu_shader_displacement(GPUM
                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_displacement_object", in, out, 
GPU_builtin(GPU_OBJECT_MATRIX));
 +              return GPU_stack_link(mat, node, "node_displacement_object", 
in, out, GPU_builtin(GPU_OBJECT_MATRIX));
        }
        else {
 -              return GPU_stack_link(mat, "node_displacement_world", in, out, 
GPU_builtin(GPU_OBJECT_MATRIX));
 +              return GPU_stack_link(mat, node, "node_displacement_world", in, 
out, GPU_builtin(GPU_OBJECT_MATRIX));
        }
  }
  
diff --cc source/blender/nodes/shader/nodes/node_shader_vector_displacement.c
index c864a606812,073bc3110f6..79b41509fcc
--- a/source/blender/nodes/shader/nodes/node_shader_vector_displacement.c
+++ b/source/blender/nodes/shader/nodes/node_shader_vector_displacement.c
@@@ -48,9 -48,8 +48,9 @@@ static void node_shader_init_vector_dis
  
  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",
                                      in,
                                      out,
@@@ -59,11 -58,11 +59,11 @@@
                                      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_vector_displacement_object", 
in, out, GPU_builtin(GPU_OBJECT_MATRIX));
 +              return GPU_stack_link(mat, node, 
"node_vector_displacement_object", in, out, GPU_builtin(GPU_OBJECT_MATRIX));
        }
        else {
 -              return GPU_stack_link(mat, "node_vector_displacement_world", 
in, out);
 +              return GPU_stack_link(mat, node, 
"node_vector_displacement_world", in, out);
        }
  }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to