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)
commit25b7bdb6a96acfa0a43a50d5087a2d9be17347c1
tree2e2feeb5e205cdc4328df0ab40975809ef4369f5
parent1f1c2d8ce8744c84d0c663885ef5da04c301fefc
parent5c0d8bcdc7c928d389f54ce3beb6f7d9d3c63021
Merge branch 'master' into blender2.8
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