Merge branch 'blender2.7'
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Wed, 6 Mar 2019 12:45:21 +0000 (13:45 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Wed, 6 Mar 2019 12:45:21 +0000 (13:45 +0100)
1  2 
intern/cycles/device/device_cpu.cpp

Simple merge