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:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2018-02-09 22:36:37 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2018-02-09 22:36:59 +0300
commit832f7a6648439b2b47121900d73aee6c2a710ec0 (patch)
tree32eaf5bb222f37fdd3fa4a88aad193cbc0df652c /source/blender/nodes
parent5216eaec1df78954834ccba3f3dadd6c63818683 (diff)
parenta6968e87f1338081f30725f8f2ca3460e280fea2 (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/nodes')
-rw-r--r--source/blender/nodes/shader/nodes/node_shader_bsdf_principled.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/nodes/shader/nodes/node_shader_bsdf_principled.c b/source/blender/nodes/shader/nodes/node_shader_bsdf_principled.c
index b0ca4128d19..1c291cb5b83 100644
--- a/source/blender/nodes/shader/nodes/node_shader_bsdf_principled.c
+++ b/source/blender/nodes/shader/nodes/node_shader_bsdf_principled.c
@@ -61,6 +61,7 @@ static bNodeSocketTemplate sh_node_bsdf_principled_out[] = {
static void node_shader_init_principled(bNodeTree *UNUSED(ntree), bNode *node)
{
node->custom1 = SHD_GLOSSY_MULTI_GGX;
+ node->custom2 = SHD_SUBSURFACE_BURLEY;
}
static int node_shader_gpu_bsdf_principled(GPUMaterial *mat, bNode *node, bNodeExecData *UNUSED(execdata), GPUNodeStack *in, GPUNodeStack *out)