Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sun, 29 Jul 2018 02:12:36 +0000 (12:12 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 29 Jul 2018 02:12:36 +0000 (12:12 +1000)
commit66a00b64c5cc64e28289147fdfbcf5bf8f046c34
treeda8549b8e9b8b49d8d80f5801a83b80c9b72e2cb
parent8f01623ef314f72ac7628d7fd54c1855cd0cb731
parent018c9af446de10f038a6e641ca3a61ce451a7c92
Merge branch 'master' into blender2.8
intern/cycles/kernel/kernel_light.h
source/blender/editors/space_file/file_panels.c