[Bf-blender-cvs] [f346cb5b473] cycles-x: Cycles X: Silence OIDN denoising cancel message

[Sergey Sharybin]

Commit: f346cb5b4732384c4c0622054f8ae7349e09ea9b
Author: Sergey Sharybin
Date:   Thu Aug 5 17:16:17 2021 +0200
Branches: cycles-x
https://developer.blender.org/rBf346cb5b4732384c4c0622054f8ae7349e09ea9b

Cycles X: Silence OIDN denoising cancel message

Cancel is considered to be an error by the OIDN library, but we do
cancel to keep viewport interactive and this is not an error as far
as we are concerned.

===================================================================

M	intern/cycles/integrator/denoiser_oidn.cpp

===================================================================

diff --git a/intern/cycles/integrator/denoiser_oidn.cpp b/intern/cycles/integrator/denoiser_oidn.cpp
index 2726baaebe8..12bf6425e06 100644
--- a/intern/cycles/integrator/denoiser_oidn.cpp
+++ b/intern/cycles/integrator/denoiser_oidn.cpp
@@ -199,7 +199,8 @@ class OIDNDenoiseContext {
 
     /* Check for errors. */
     const char *error_message;
-    if (oidn_device.getError(error_message) != oidn::Error::None) {
+    const oidn::Error error = oidn_device.getError(error_message);
+    if (error != oidn::Error::None && error != oidn::Error::Cancelled) {
       LOG(ERROR) << "OpenImageDenoise error: " << error_message;
     }