Merge branch 'master' into blender2.8
authorSybren A. Stüvel <sybren@stuvel.eu>
Tue, 26 Jun 2018 15:42:33 +0000 (17:42 +0200)
committerSybren A. Stüvel <sybren@stuvel.eu>
Tue, 26 Jun 2018 15:42:33 +0000 (17:42 +0200)
commitb4c01aca30faa16900084c081faff6fbaf130872
tree51e66b197e1706b22fd6b832c4a223ebdfb1b375
parentd5a42bce38fd6548728b47a4ec76afdd75668341
parent599e979d90327c1e10031f992cb2be2cda414825
Merge branch 'master' into blender2.8
intern/cycles/render/shader.h
source/blender/makesdna/intern/dna_genfile.c