[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46076] trunk/blender/source/blender/nodes /shader/nodes/node_shader_tex_coord.c: Cycles: missed merging this file from tomato branch, for normal output in node.
Brecht Van Lommel
brechtvanlommel at pandora.be
Sun Apr 29 16:23:50 CEST 2012
Revision: 46076
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46076
Author: blendix
Date: 2012-04-29 14:23:50 +0000 (Sun, 29 Apr 2012)
Log Message:
-----------
Cycles: missed merging this file from tomato branch, for normal output in node.
Modified Paths:
--------------
trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_coord.c
Modified: trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_coord.c
===================================================================
--- trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_coord.c 2012-04-29 14:10:13 UTC (rev 46075)
+++ trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_coord.c 2012-04-29 14:23:50 UTC (rev 46076)
@@ -33,6 +33,7 @@
static bNodeSocketTemplate sh_node_tex_coord_out[]= {
{ SOCK_VECTOR, 0, "Generated", 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+ { SOCK_VECTOR, 0, "Normal", 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
{ SOCK_VECTOR, 0, "UV", 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
{ SOCK_VECTOR, 0, "Object", 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
{ SOCK_VECTOR, 0, "Camera", 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
@@ -48,7 +49,7 @@
return GPU_stack_link(mat, "node_tex_coord", in, out,
GPU_builtin(GPU_VIEW_POSITION), GPU_builtin(GPU_VIEW_NORMAL),
- GPU_builtin(GPU_INVERSE_VIEW_MATRIX), orco, mtface);
+ GPU_builtin(GPU_INVERSE_VIEW_MATRIX), GPU_builtin(GPU_INVERSE_OBJECT_MATRIX), orco, mtface);
}
/* node type definition */
More information about the Bf-blender-cvs
mailing list