Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-06-30 10:29:38 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-06-30 10:29:38 +0300
commit25b7bdb6a96acfa0a43a50d5087a2d9be17347c1 (patch)
tree2e2feeb5e205cdc4328df0ab40975809ef4369f5 /source/blender/nodes
parent1f1c2d8ce8744c84d0c663885ef5da04c301fefc (diff)
parent5c0d8bcdc7c928d389f54ce3beb6f7d9d3c63021 (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/nodes')
-rw-r--r--source/blender/nodes/shader/nodes/node_shader_ambient_occlusion.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/nodes/shader/nodes/node_shader_ambient_occlusion.c b/source/blender/nodes/shader/nodes/node_shader_ambient_occlusion.c
index 673e6c61885..4c770984717 100644
--- a/source/blender/nodes/shader/nodes/node_shader_ambient_occlusion.c
+++ b/source/blender/nodes/shader/nodes/node_shader_ambient_occlusion.c
@@ -52,8 +52,8 @@ static int node_shader_gpu_ambient_occlusion(GPUMaterial *mat, bNode *node, bNod
static void node_shader_init_ambient_occlusion(bNodeTree *UNUSED(ntree), bNode *node)
{
- node->custom1 = 8; /* samples */
- node->custom2 = SHD_AO_LOCAL;
+ node->custom1 = 16; /* samples */
+ node->custom2 = 0;
}
/* node type definition */