Merge branch 'master' into blender2.8

2 files changed, 3 insertions, 3 deletions

diff --git a/intern/cycles/kernel/shaders/node_ambient_occlusion.osl b/intern/cycles/kernel/shaders/node_ambient_occlusion.osl
index d7ffa3c1606..865ad4c9fb9 100644
--- a/intern/cycles/kernel/shaders/node_ambient_occlusion.osl
+++ b/intern/cycles/kernel/shaders/node_ambient_occlusion.osl
@@ -17,13 +17,13 @@
 #include "stdosl.h"
 
 shader node_ambient_occlusion(
-	color ColorIn = color(0.8, 0.8, 0.8),
+	color ColorIn = color(1.0, 1.0, 1.0),
 	int samples = 8,
 	float Distance = 1.0,
 	normal Normal = N,
 	int inside = 0,
 	int only_local = 1,
-	output color ColorOut = color(0.8, 0.8, 0.8),
+	output color ColorOut = color(1.0, 1.0, 1.0),
 	output float AO = 1.0)
 {
 	int global_radius = (Distance == 0.0 && !isconnected(Distance));
diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp
index 59ac6257499..ea25056e9fd 100644
--- a/intern/cycles/render/nodes.cpp
+++ b/intern/cycles/render/nodes.cpp
@@ -2794,7 +2794,7 @@ NODE_DEFINE(AmbientOcclusionNode)
 
 	SOCKET_INT(samples, "Samples", 8);
 
-	SOCKET_IN_COLOR(color, "Color", make_float3(0.8f, 0.8f, 0.8f));
+	SOCKET_IN_COLOR(color, "Color", make_float3(1.0f, 1.0f, 1.0f));
 	SOCKET_IN_FLOAT(distance, "Distance", 1.0f);
 	SOCKET_IN_NORMAL(normal, "Normal", make_float3(0.0f, 0.0f, 0.0f), SocketType::LINK_NORMAL);