[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52233] trunk/blender/intern/cycles: Fix #33183: cycles bump mapping was not executed with only an AO node in a material.

[Brecht Van Lommel]

Revision: 52233
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52233
Author:   blendix
Date:     2012-11-15 14:08:46 +0000 (Thu, 15 Nov 2012)
Log Message:
-----------
Fix #33183: cycles bump mapping was not executed with only an AO node in a material.

Modified Paths:
--------------
    trunk/blender/intern/cycles/kernel/shaders/node_ambient_occlusion.osl
    trunk/blender/intern/cycles/render/nodes.cpp

Modified: trunk/blender/intern/cycles/kernel/shaders/node_ambient_occlusion.osl
===================================================================
--- trunk/blender/intern/cycles/kernel/shaders/node_ambient_occlusion.osl	2012-11-15 14:06:05 UTC (rev 52232)
+++ trunk/blender/intern/cycles/kernel/shaders/node_ambient_occlusion.osl	2012-11-15 14:08:46 UTC (rev 52233)
@@ -19,6 +19,7 @@
 #include "stdosl.h"
 
 shader node_ambient_occlusion(
+	normal NormalIn = N,
 	color Color = color(0.8, 0.8, 0.8),
 	output closure color AO = ambient_occlusion())
 {

Modified: trunk/blender/intern/cycles/render/nodes.cpp
===================================================================
--- trunk/blender/intern/cycles/render/nodes.cpp	2012-11-15 14:06:05 UTC (rev 52232)
+++ trunk/blender/intern/cycles/render/nodes.cpp	2012-11-15 14:08:46 UTC (rev 52233)
@@ -1578,6 +1578,8 @@
 AmbientOcclusionNode::AmbientOcclusionNode()
 : ShaderNode("ambient_occlusion")
 {
+	add_input("NormalIn", SHADER_SOCKET_NORMAL, ShaderInput::NORMAL, true);
+
 	add_input("Color", SHADER_SOCKET_COLOR, make_float3(0.8f, 0.8f, 0.8f));
 	add_output("AO", SHADER_SOCKET_CLOSURE);
 }