Merge branch 'master' into blender2.8
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Fri, 9 Feb 2018 19:36:37 +0000 (20:36 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Fri, 9 Feb 2018 19:36:59 +0000 (20:36 +0100)
commit832f7a6648439b2b47121900d73aee6c2a710ec0
tree32eaf5bb222f37fdd3fa4a88aad193cbc0df652c
parent5216eaec1df78954834ccba3f3dadd6c63818683
parenta6968e87f1338081f30725f8f2ca3460e280fea2
Merge branch 'master' into blender2.8
intern/cycles/blender/addon/version_update.py
intern/cycles/blender/blender_shader.cpp
source/blender/editors/space_node/drawnode.c
source/blender/gpu/intern/gpu_material.c
source/blender/makesdna/DNA_node_types.h
source/blender/makesrna/intern/rna_nodetree.c
source/blender/nodes/shader/nodes/node_shader_bsdf_principled.c