Merge branch 'blender-v2.81-release'
authorCampbell Barton <ideasman42@gmail.com>
Mon, 28 Oct 2019 14:38:34 +0000 (01:38 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 28 Oct 2019 14:38:34 +0000 (01:38 +1100)
1  2 
intern/cycles/kernel/CMakeLists.txt

Simple merge