Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cycles: change AO node default to 16 samples and only local off.

Browse Source
This commit is contained in:
Brecht Van Lommel
2018-06-29 15:02:09 +02:00
parent b372766816
commit ccacf3ae3c
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
intern/cycles/kernel/shaders/node_ambient_occlusion.osl
View File

@@ -18,11 +18,11 @@
shader node_ambient_occlusion( shader node_ambient_occlusion(
color ColorIn = color(1.0, 1.0, 1.0), color ColorIn = color(1.0, 1.0, 1.0),
int samples = 8, int samples = 16,
float Distance = 1.0, float Distance = 1.0,
normal Normal = N, normal Normal = N,
int inside = 0, int inside = 0,
int only_local = 1, int only_local = 0,
output color ColorOut = color(1.0, 1.0, 1.0), output color ColorOut = color(1.0, 1.0, 1.0),
output float AO = 1.0) output float AO = 1.0)
{ {

4
intern/cycles/render/nodes.cpp
View File

@@ -2795,14 +2795,14 @@ NODE_DEFINE(AmbientOcclusionNode)
{ {
NodeType* type = NodeType::add("ambient_occlusion", create, NodeType::SHADER); 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_COLOR(color, "Color", make_float3(1.0f, 1.0f, 1.0f));
SOCKET_IN_FLOAT(distance, "Distance", 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_IN_NORMAL(normal, "Normal", make_float3(0.0f, 0.0f, 0.0f), SocketType::LINK_NORMAL);
SOCKET_BOOLEAN(inside, "Inside", false); 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_COLOR(color, "Color");
SOCKET_OUT_FLOAT(ao, "AO"); SOCKET_OUT_FLOAT(ao, "AO");

4
source/blender/nodes/shader/nodes/node_shader_ambient_occlusion.c
View File

@@ -49,8 +49,8 @@ static int node_shader_gpu_ambient_occlusion(GPUMaterial *mat, bNode *UNUSED(nod
static void node_shader_init_ambient_occlusion(bNodeTree *UNUSED(ntree), bNode *node) static void node_shader_init_ambient_occlusion(bNodeTree *UNUSED(ntree), bNode *node)
{ {
node->custom1 = 8; /* samples */ node->custom1 = 16; /* samples */
node->custom2 = SHD_AO_LOCAL; node->custom2 = 0;
} }
/* node type definition */ /* node type definition */