Blender Internal: Revert own previous commit for "Camera Data" node, correct GLSL code for view vector output of "Geometry" node.

Revert 0c7d2de38219. The "Camera Data" node actually gives the location
of the point in camera coordinate system.  To obtain actual camera data,
we can use "Geometry" node instead.

Also modify the "Geometry" node, to produce correct view vector output
in orthographic GLSL preview.

1 files changed, 2 insertions, 2 deletions

diff --git a/source/blender/nodes/shader/nodes/node_shader_camera.c b/source/blender/nodes/shader/nodes/node_shader_camera.c
index 0f0f191e1e5..d1ff30ef7d1 100644
--- a/source/blender/nodes/shader/nodes/node_shader_camera.c
+++ b/source/blender/nodes/shader/nodes/node_shader_camera.c
@@ -46,9 +46,9 @@ static void node_shader_exec_camera(void *data, int UNUSED(thread), bNode *UNUSE
 	if (data) {
 		ShadeInput *shi = ((ShaderCallData *)data)->shi;  /* Data we need for shading. */
 		
-		copy_v3_v3(out[0]->vec, shi->view);     /* get view vector */
+		copy_v3_v3(out[0]->vec, shi->co);       /* get view vector */
 		out[1]->vec[0] = fabs(shi->co[2]);      /* get view z-depth */
-		out[2]->vec[0] = len_v3(shi->co);       /* get view distance */
+		out[2]->vec[0] = normalize_v3(out[0]->vec); /* get view distance */
 	}
 }