diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2016-06-18 23:25:54 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2016-06-18 23:33:29 +0300 |
| commit | 2465bd90d5a12fbb074f25898ca3f4a6c6def953 (patch) | |
| tree | 6d8af123f7d4acbaf00e601c531973523e71c3ff /source/blender/nodes | |
| parent | d67c07ea49ec06a547b8b4ec287642b83ea6d9c4 (diff) | |
Cleanup: style, whitespace, doxy filepaths
Diffstat (limited to 'source/blender/nodes')
| -rw-r--r-- | source/blender/nodes/shader/node_shader_tree.c | 2 | ||||
| -rw-r--r-- | source/blender/nodes/shader/nodes/node_shader_normal_map.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/nodes/shader/node_shader_tree.c b/source/blender/nodes/shader/node_shader_tree.c index b22f5b662ba..5b65a2bbfd4 100644 --- a/source/blender/nodes/shader/node_shader_tree.c +++ b/source/blender/nodes/shader/node_shader_tree.c @@ -330,7 +330,7 @@ static void ntree_shader_link_builtin_group_normal( node_group_input_verify(group_ntree, group_input_node, &group_ntree->id); ntreeUpdateTree(G.main, group_ntree); /* Assumes sockets are always added at the end. */ - bNodeSocket *group_node_normal_socket = (bNodeSocket*)group_node->inputs.last; + bNodeSocket *group_node_normal_socket = group_node->inputs.last; if (displacement_node == group_node) { /* If displacement is coming from this node group we need to perform * some internal re-linking in order to avoid cycles. diff --git a/source/blender/nodes/shader/nodes/node_shader_normal_map.c b/source/blender/nodes/shader/nodes/node_shader_normal_map.c index 57014bdc476..48d1688c386 100644 --- a/source/blender/nodes/shader/nodes/node_shader_normal_map.c +++ b/source/blender/nodes/shader/nodes/node_shader_normal_map.c @@ -172,7 +172,8 @@ static int gpu_shader_normal_map(GPUMaterial *mat, bNode *node, bNodeExecData *U break; } - } else { + } + else { /* ************** BLENDER INTERNAL without world space shading flag ******* */ |