Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 13 Jul 2018 10:22:21 +0000 (12:22 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 13 Jul 2018 10:22:21 +0000 (12:22 +0200)
1  2 
intern/cycles/render/nodes.cpp
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_math.c

Simple merge