Merge branch 'blender-v3.2-release'

This commit is contained in:
Campbell Barton
2022-05-12 17:49:40 +10:00

View File

@@ -626,6 +626,7 @@ uint OIDNDenoiser::get_device_type_mask() const
Device *OIDNDenoiser::ensure_denoiser_device(Progress *progress)
{
#ifndef WITH_OPENIMAGEDENOISE
(void)progress;
path_trace_device_->set_error("Build without OpenImageDenoiser");
return nullptr;
#else