Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sat, 30 Jun 2018 07:29:38 +0000 (09:29 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 30 Jun 2018 07:29:38 +0000 (09:29 +0200)
1  2 
intern/cycles/render/nodes.cpp
source/blender/editors/interface/interface_handlers.c
source/blender/editors/interface/interface_layout.c
source/blender/nodes/shader/nodes/node_shader_ambient_occlusion.c

Simple merge