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.
This commit is contained in:
Brecht Van Lommel
2020-06-25 15:14:30 +02:00
parent 2b9ac1de49
commit 79c2581bfa
2 changed files with 17 additions and 7 deletions

View File

@@ -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);
}
}