Merge branch 'master' into blender2.8
[blender.git] / intern / cycles / render / nodes.cpp
index ea25056e9fdf139112f6b513b0b441541175a6d7..e7f13f3123f3360c096a4ddc208e2dce44b1dc3c 100644 (file)
@@ -2792,14 +2792,14 @@ NODE_DEFINE(AmbientOcclusionNode)
 {
        NodeType* type = NodeType::add("ambient_occlusion", create, NodeType::SHADER);
 
-       SOCKET_INT(samples, "Samples", 8);
+       SOCKET_INT(samples, "Samples", 16);
 
        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);
 
        SOCKET_BOOLEAN(inside, "Inside", false);
-       SOCKET_BOOLEAN(only_local, "Only Local", true);
+       SOCKET_BOOLEAN(only_local, "Only Local", false);
 
        SOCKET_OUT_COLOR(color, "Color");
        SOCKET_OUT_FLOAT(ao, "AO");