[Bf-blender-cvs] [bc1781cf6a3] master: EEVEE: Fix broken bump regression

Clément Foucault noreply at git.blender.org
Tue Sep 3 17:46:33 CEST 2019


Commit: bc1781cf6a3c283f19a53a959f650692bf85c76d
Author: Clément Foucault
Date:   Tue Sep 3 17:45:50 2019 +0200
Branches: master
https://developer.blender.org/rBbc1781cf6a3c283f19a53a959f650692bf85c76d

EEVEE: Fix broken bump regression

Regression introduced by 7f4a2fc437cf9a6decbda152bd7d36ce7a08929f

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

M	source/blender/nodes/shader/node_shader_tree.c

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

diff --git a/source/blender/nodes/shader/node_shader_tree.c b/source/blender/nodes/shader/node_shader_tree.c
index 60a6cc91630..41f13087f67 100644
--- a/source/blender/nodes/shader/node_shader_tree.c
+++ b/source/blender/nodes/shader/node_shader_tree.c
@@ -802,10 +802,12 @@ static void ntree_shader_relink_displacement(bNodeTree *ntree, bNode *output_nod
   bNode *dot_node = nodeAddStaticNode(NULL, ntree, SH_NODE_VECTOR_MATH);
   bNode *geo_node = nodeAddStaticNode(NULL, ntree, SH_NODE_NEW_GEOMETRY);
   bNodeSocket *normal_socket = ntree_shader_node_find_output(geo_node, "Normal");
-  dot_node->custom1 = 3; /* dot product */
+  bNodeSocket *dot_input1 = dot_node->inputs.first;
+  bNodeSocket *dot_input2 = dot_input1->next;
+  dot_node->custom1 = NODE_VECTOR_MATH_DOT_PRODUCT;
 
-  nodeAddLink(ntree, displacement_node, displacement_socket, dot_node, dot_node->inputs.first);
-  nodeAddLink(ntree, geo_node, normal_socket, dot_node, dot_node->inputs.last);
+  nodeAddLink(ntree, displacement_node, displacement_socket, dot_node, dot_input1);
+  nodeAddLink(ntree, geo_node, normal_socket, dot_node, dot_input2);
   displacement_node = dot_node;
   displacement_socket = ntree_shader_node_find_output(dot_node, "Value");



More information about the Bf-blender-cvs mailing list