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)
1  2 
intern/cycles/device/device_optix.cpp
intern/cycles/kernel/kernel_types.h
intern/cycles/render/scene.cpp

Simple merge
Simple merge
Simple merge