diff options
Diffstat (limited to 'release/scripts')
6 files changed, 40 insertions, 34 deletions
diff --git a/release/scripts/modules/rna_manual_reference.py b/release/scripts/modules/rna_manual_reference.py index 0e3cb7e3cab..40f59307bec 100644 --- a/release/scripts/modules/rna_manual_reference.py +++ b/release/scripts/modules/rna_manual_reference.py @@ -209,7 +209,6 @@ url_manual_mapping = ( ("bpy.types.toolsettings.use_proportional_connected*", "editors/3dview/controls/proportional_editing.html#bpy-types-toolsettings-use-proportional-connected"), ("bpy.types.toolsettings.use_proportional_projected*", "editors/3dview/controls/proportional_editing.html#bpy-types-toolsettings-use-proportional-projected"), ("bpy.types.view3doverlay.vertex_paint_mode_opacity*", "editors/3dview/display/overlays.html#bpy-types-view3doverlay-vertex-paint-mode-opacity"), - ("bpy.types.viewlayer.use_pass_cryptomatte_accurate*", "render/layers/passes.html#bpy-types-viewlayer-use-pass-cryptomatte-accurate"), ("bpy.types.viewlayer.use_pass_cryptomatte_material*", "render/layers/passes.html#bpy-types-viewlayer-use-pass-cryptomatte-material"), ("bpy.ops.gpencil.vertex_color_brightness_contrast*", "grease_pencil/modes/vertex_paint/editing.html#bpy-ops-gpencil-vertex-color-brightness-contrast"), ("bpy.ops.view3d.edit_mesh_extrude_individual_move*", "modeling/meshes/editing/face/extrude_faces.html#bpy-ops-view3d-edit-mesh-extrude-individual-move"), @@ -573,7 +572,6 @@ url_manual_mapping = ( ("bpy.types.rendersettings.film_transparent*", "render/cycles/render_settings/film.html#bpy-types-rendersettings-film-transparent"), ("bpy.types.rendersettings.simplify_volumes*", "render/cycles/render_settings/simplify.html#bpy-types-rendersettings-simplify-volumes"), ("bpy.types.rendersettings.use_render_cache*", "render/output/properties/output.html#bpy-types-rendersettings-use-render-cache"), - ("bpy.types.rendersettings.use_save_buffers*", "render/cycles/render_settings/performance.html#bpy-types-rendersettings-use-save-buffers"), ("bpy.types.rendersettings.use_single_layer*", "render/layers/view_layer.html#bpy-types-rendersettings-use-single-layer"), ("bpy.types.sceneeevee.use_taa_reprojection*", "render/eevee/render_settings/sampling.html#bpy-types-sceneeevee-use-taa-reprojection"), ("bpy.types.sequenceeditor.use_overlay_lock*", "video_editing/preview/sidebar.html#bpy-types-sequenceeditor-use-overlay-lock"), diff --git a/release/scripts/presets/cycles/sampling/Final.py b/release/scripts/presets/cycles/sampling/Final.py index f1222d927c1..f3626c4b778 100644 --- a/release/scripts/presets/cycles/sampling/Final.py +++ b/release/scripts/presets/cycles/sampling/Final.py @@ -1,18 +1,12 @@ import bpy cycles = bpy.context.scene.cycles -# Path Trace -cycles.samples = 512 -cycles.preview_samples = 128 - -# Branched Path Trace -cycles.aa_samples = 128 -cycles.preview_aa_samples = 32 - -cycles.diffuse_samples = 4 -cycles.glossy_samples = 4 -cycles.transmission_samples = 4 -cycles.ao_samples = 1 -cycles.mesh_light_samples = 4 -cycles.subsurface_samples = 4 -cycles.volume_samples = 4 +cycles.use_adaptive_sampling = True +cycles.adaptive_threshold = 0.01 +cycles.samples = 4096 +cycles.adaptive_min_samples = 0 +cycles.time_limit = 0.0 +cycles.use_denoising = True +cycles.denoiser = 'OPENIMAGEDENOISE' +cycles.denoising_input_passes = 'RGB_ALBEDO_NORMAL' +cycles.denoising_prefilter = 'ACCURATE' diff --git a/release/scripts/presets/cycles/sampling/Preview.py b/release/scripts/presets/cycles/sampling/Preview.py index c16449e2c8f..66aa9339063 100644 --- a/release/scripts/presets/cycles/sampling/Preview.py +++ b/release/scripts/presets/cycles/sampling/Preview.py @@ -1,18 +1,12 @@ import bpy cycles = bpy.context.scene.cycles -# Path Trace -cycles.samples = 128 -cycles.preview_samples = 32 - -# Branched Path Trace -cycles.aa_samples = 32 -cycles.preview_aa_samples = 4 - -cycles.diffuse_samples = 4 -cycles.glossy_samples = 4 -cycles.transmission_samples = 4 -cycles.ao_samples = 1 -cycles.mesh_light_samples = 4 -cycles.subsurface_samples = 4 -cycles.volume_samples = 4 +cycles.use_adaptive_sampling = True +cycles.adaptive_threshold = 0.1 +cycles.samples = 1024 +cycles.adaptive_min_samples = 0 +cycles.time_limit = 0.0 +cycles.use_denoising = True +cycles.denoiser = 'OPENIMAGEDENOISE' +cycles.denoising_input_passes = 'RGB_ALBEDO_NORMAL' +cycles.denoising_prefilter = 'ACCURATE' diff --git a/release/scripts/presets/cycles/viewport_sampling/Final.py b/release/scripts/presets/cycles/viewport_sampling/Final.py new file mode 100644 index 00000000000..b2cb6bfe90a --- /dev/null +++ b/release/scripts/presets/cycles/viewport_sampling/Final.py @@ -0,0 +1,11 @@ +import bpy +cycles = bpy.context.scene.cycles + +cycles.use_preview_adaptive_sampling = True +cycles.preview_adaptive_threshold = 0.01 +cycles.preview_samples = 4096 +cycles.preview_adaptive_min_samples = 0 +cycles.use_preview_denoising = True +cycles.preview_denoiser = 'OPENIMAGEDENOISE' +cycles.preview_denoising_input_passes = 'RGB_ALBEDO_NORMAL' +cycles.preview_denoising_prefilter = 'ACCURATE' diff --git a/release/scripts/presets/cycles/viewport_sampling/Preview.py b/release/scripts/presets/cycles/viewport_sampling/Preview.py new file mode 100644 index 00000000000..f8319b70d4a --- /dev/null +++ b/release/scripts/presets/cycles/viewport_sampling/Preview.py @@ -0,0 +1,11 @@ +import bpy +cycles = bpy.context.scene.cycles + +cycles.use_preview_adaptive_sampling = True +cycles.preview_adaptive_threshold = 0.1 +cycles.preview_samples = 1024 +cycles.preview_adaptive_min_samples = 0 +cycles.use_preview_denoising = False +cycles.preview_denoiser = 'AUTO' +cycles.preview_denoising_input_passes = 'RGB_ALBEDO' +cycles.preview_denoising_prefilter = 'FAST' diff --git a/release/scripts/startup/bl_ui/properties_view_layer.py b/release/scripts/startup/bl_ui/properties_view_layer.py index ad7d6008238..6b130d7353d 100644 --- a/release/scripts/startup/bl_ui/properties_view_layer.py +++ b/release/scripts/startup/bl_ui/properties_view_layer.py @@ -192,8 +192,6 @@ class ViewLayerCryptomattePanel(ViewLayerButtonsPanel, Panel): view_layer.use_pass_cryptomatte_material, view_layer.use_pass_cryptomatte_asset)) col.prop(view_layer, "pass_cryptomatte_depth", text="Levels") - col.prop(view_layer, "use_pass_cryptomatte_accurate", - text="Accurate Mode") class VIEWLAYER_PT_layer_passes_cryptomatte(ViewLayerCryptomattePanel, Panel): |