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)
1  2 
intern/cycles/render/shader.h
source/blender/makesdna/intern/dna_genfile.c

Simple merge