Fix T78238: issue loading existing .blend files with Optix viewport denoiser

Also add additional validation to ensure the denoiser is supported before
trying to use it.

1 files changed, 2 insertions, 1 deletions

diff --git a/source/blender/blenloader/intern/versioning_cycles.c b/source/blender/blenloader/intern/versioning_cycles.c
index 72ee4c5ec4d..46faddf6e5a 100644
--- a/source/blender/blenloader/intern/versioning_cycles.c
+++ b/source/blender/blenloader/intern/versioning_cycles.c
@@ -1568,6 +1568,7 @@ void do_versions_after_linking_cycles(Main *bmain)
       }
 
       if (cscene) {
+        const int DENOISER_AUTO = 0;
         const int DENOISER_NLM = 1;
         const int DENOISER_OPTIX = 2;
 
@@ -1578,7 +1579,7 @@ void do_versions_after_linking_cycles(Main *bmain)
         /* Migrate Optix denoiser to new settings. */
         if (cycles_property_int(cscene, "preview_denoising", 0)) {
           cycles_property_boolean_set(cscene, "use_preview_denoising", true);
-          cycles_property_boolean_set(cscene, "preview_denoiser", DENOISER_OPTIX);
+          cycles_property_int_set(cscene, "preview_denoiser", DENOISER_AUTO);
         }
       }