Merge remote-tracking branch 'origin/blender-v2.93-release'
authorSybren A. Stüvel <sybren@blender.org>
Thu, 20 May 2021 11:00:07 +0000 (13:00 +0200)
committerSybren A. Stüvel <sybren@blender.org>
Thu, 20 May 2021 11:00:07 +0000 (13:00 +0200)
commit0745afeddb6041e5bc9f862a155e5f30d431a88c
tree5ff02a23ce6784381389fa21e30bf0f78abc6c1f
parent3e3ecc329caa25285a4bb6cfbb69f4eb40797fe4
parenta1954e380730ae9d116245343d9296d587907673
Merge remote-tracking branch 'origin/blender-v2.93-release'
intern/cycles/device/device_optix.cpp
intern/cycles/kernel/kernel_types.h
intern/cycles/render/scene.cpp