diff options
| -rw-r--r-- | intern/cycles/blender/addon/ui.py | 2 | ||||
| -rw-r--r-- | intern/cycles/blender/blender_session.cpp | 2 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 1 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_scene.c | 5 |
4 files changed, 1 insertions, 9 deletions
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py index a4026d786e5..93c8720b070 100644 --- a/intern/cycles/blender/addon/ui.py +++ b/intern/cycles/blender/addon/ui.py @@ -594,8 +594,6 @@ class CyclesRender_PT_denoising(CyclesButtonsPanel, Panel): col = layout.column() - col.prop(rl, "keep_denoise_data") - sub = col.column(align=True) sub.prop(rl, "half_window") sub.prop(rl, "filter_strength", slider=True) diff --git a/intern/cycles/blender/blender_session.cpp b/intern/cycles/blender/blender_session.cpp index d8af3681e9e..fedd61e7916 100644 --- a/intern/cycles/blender/blender_session.cpp +++ b/intern/cycles/blender/blender_session.cpp @@ -505,7 +505,7 @@ void BlenderSession::render() } buffer_params.passes = passes; - buffer_params.denoising_data_pass = b_layer_iter->keep_denoise_data() || b_layer_iter->denoise_result(); + buffer_params.denoising_data_pass = b_layer_iter->denoise_result(); session->tile_manager.schedule_denoising = (b_layer_iter->denoise_result() && is_cpu) && !getenv("CPU_OVERSCAN"); session->params.denoise_result = b_layer_iter->denoise_result(); scene->film->denoising_data_pass = buffer_params.denoising_data_pass; diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index 0582dc72d8c..2e9f53c6109 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -257,7 +257,6 @@ typedef struct SceneRenderLayer { typedef enum SceneDenoiseFlag { SCE_DENOISE_RESULT = (1 << 0), - SCE_DENOISE_STORE_PASSES = (1 << 1), SCE_DENOISE_PASS_DIFFDIR = (1 << 2), SCE_DENOISE_PASS_DIFFIND = (1 << 3), SCE_DENOISE_PASS_GLOSSDIR = (1 << 4), diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index 8303bfb5419..5f578ad2c0b 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -5095,11 +5095,6 @@ static void rna_def_scene_render_layer(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Denoise Render Result", "Denoise the rendered image during rendering"); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); - prop = RNA_def_property(srna, "keep_denoise_data", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_sdna(prop, NULL, "denoiseflag", SCE_DENOISE_STORE_PASSES); - RNA_def_property_ui_text(prop, "Keep denoising data", "Store the denoising data so that the image can be denoised later"); - RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); - prop = RNA_def_property(srna, "denoise_diffuse_direct", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "denoiseflag", SCE_DENOISE_PASS_DIFFDIR); RNA_def_property_ui_text(prop, "Diffuse Direct", "Denoise the direct diffuse lighting"); |