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)
commitebcea3029d8ffa893431620947caf7e16e6fb8e9
tree1a9b1441fd8c0fefa5ea479eff6e2db7c97b5fe7
parentc80415627e9c8e1d4eb74a34a0916126a0e9fc1a
parentf08191a4596a23dd6372b5b82ed3d5623899b139
Merge branch 'blender2.7'
intern/cycles/device/device_cpu.cpp