Merge branch 'master' into blender2.8
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Wed, 18 Jul 2018 12:13:02 +0000 (14:13 +0200)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Wed, 18 Jul 2018 12:13:16 +0000 (14:13 +0200)
commit3d67819a1709e35b2fb42a9d554b30136a72eec9
treeda74b41c52fab9592ee12e3db0c046bf70d85d5a
parent257d072317f21861cdb7c168a60497bcb74d73d4
parent5078b9d2d08a34ae3786100c2301ea960165e7f2
Merge branch 'master' into blender2.8
27 files changed:
intern/cycles/blender/blender_shader.cpp
intern/cycles/render/nodes.cpp
intern/cycles/render/nodes.h
release/scripts/startup/nodeitems_builtins.py
source/blender/blenkernel/BKE_node.h
source/blender/blenkernel/intern/node.c
source/blender/blenlib/CMakeLists.txt
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/compositor/CMakeLists.txt
source/blender/editors/include/UI_interface.h
source/blender/editors/interface/interface_eyedropper.c
source/blender/editors/interface/interface_eyedropper_color.c
source/blender/editors/interface/interface_intern.h
source/blender/editors/interface/interface_ops.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/space_node/drawnode.c
source/blender/editors/space_node/node_edit.c
source/blender/editors/space_node/node_intern.h
source/blender/editors/space_node/node_ops.c
source/blender/makesdna/DNA_node_types.h
source/blender/makesrna/intern/rna_nodetree.c
source/blender/nodes/CMakeLists.txt
source/blender/nodes/NOD_composite.h
source/blender/nodes/NOD_shader.h
source/blender/nodes/NOD_static_types.h
source/blender/nodes/shader/nodes/node_shader_bsdf_hair_principled.c