Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Mon, 25 Jun 2018 05:43:51 +0000 (07:43 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 25 Jun 2018 05:43:51 +0000 (07:43 +0200)
commitd32e4ca70161eb83179e4ebd1dc538afc1b311c1
tree1f7e12fb8558f2a7b3c083bc304389acda19a208
parenta5b7f1ef535038be549530612c7eed9109e1d4b4
parentf3b9fa53935e1f199063b020dded04135267b0a8
Merge branch 'master' into blender2.8
build_files/cmake/macros.cmake
intern/cycles/render/nodes.cpp
source/blender/nodes/shader/nodes/node_shader_ambient_occlusion.c