Merge branch 'master' into blender2.8
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Sat, 14 Jul 2018 22:54:12 +0000 (00:54 +0200)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Sat, 14 Jul 2018 22:54:12 +0000 (00:54 +0200)
commit680994643cf76f3b0643d0fc4d8a32094431c026
tree10bb79fc094af92c65637d64dd4d73348081702c
parent92a6b0ad6fbaef51f27105623f9be1b68103bd5d
parent83a4e1aaf9d1aa5e4747213dee5485945cecb05d
Merge branch 'master' into blender2.8
intern/cycles/blender/blender_shader.cpp
intern/cycles/render/nodes.cpp
intern/cycles/render/nodes.h
source/blender/editors/space_node/drawnode.c
source/blender/gpu/shaders/gpu_shader_material.glsl
source/blender/makesdna/DNA_node_types.h
source/blender/makesrna/intern/rna_nodetree.c
source/blender/nodes/shader/nodes/node_shader_tex_voronoi.c