diff options
author | Campbell Barton <ideasman42@gmail.com> | 2020-10-02 03:10:01 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2020-10-02 04:59:16 +0300 |
commit | bab9de2a52929fe2b45ecddb1eb09da3378e303b (patch) | |
tree | cde61c5cb86dfad1c90aa414a8c7b1711ec25782 /intern | |
parent | 28ebe827e60c84ed4731a9f8aa701ccf2d8be0b0 (diff) |
Cleanup: pep8, blank lines
Diffstat (limited to 'intern')
-rw-r--r-- | intern/cycles/blender/addon/engine.py | 3 | ||||
-rw-r--r-- | intern/cycles/blender/addon/operators.py | 1 | ||||
-rw-r--r-- | intern/cycles/blender/addon/properties.py | 6 |
3 files changed, 9 insertions, 1 deletions
diff --git a/intern/cycles/blender/addon/engine.py b/intern/cycles/blender/addon/engine.py index 67e448db859..a50b733eda2 100644 --- a/intern/cycles/blender/addon/engine.py +++ b/intern/cycles/blender/addon/engine.py @@ -224,6 +224,7 @@ def system_info(): import _cycles return _cycles.system_info() + def list_render_passes(scene, srl): # Builtin Blender passes. yield ("Combined", "RGBA", 'COLOR') @@ -298,6 +299,7 @@ def list_render_passes(scene, srl): else: yield (aov.name, "RGBA", 'COLOR') + def register_passes(engine, scene, view_layer): # Detect duplicate render pass names, first one wins. listed = set() @@ -306,6 +308,7 @@ def register_passes(engine, scene, view_layer): engine.register_pass(scene, view_layer, name, len(channelids), channelids, channeltype) listed.add(name) + def detect_conflicting_passes(scene, view_layer): # Detect conflicting render pass names for UI. counter = {} diff --git a/intern/cycles/blender/addon/operators.py b/intern/cycles/blender/addon/operators.py index 3c8e79eaba5..895e1a83c66 100644 --- a/intern/cycles/blender/addon/operators.py +++ b/intern/cycles/blender/addon/operators.py @@ -203,6 +203,7 @@ classes = ( CYCLES_OT_merge_images ) + def register(): from bpy.utils import register_class for cls in classes: diff --git a/intern/cycles/blender/addon/properties.py b/intern/cycles/blender/addon/properties.py index 45d25720aff..3d4dafb43ad 100644 --- a/intern/cycles/blender/addon/properties.py +++ b/intern/cycles/blender/addon/properties.py @@ -188,11 +188,13 @@ def enum_openimagedenoise_denoiser(self, context): return [('OPENIMAGEDENOISE', "OpenImageDenoise", "Use Intel OpenImageDenoise AI denoiser running on the CPU", 4)] return [] + def enum_optix_denoiser(self, context): if not context or bool(context.preferences.addons[__package__].preferences.get_devices_for_type('OPTIX')): return [('OPTIX', "OptiX", "Use the OptiX AI denoiser with GPU acceleration, only available on NVIDIA GPUs", 2)] return [] + def enum_preview_denoiser(self, context): optix_items = enum_optix_denoiser(self, context) oidn_items = enum_openimagedenoise_denoiser(self, context) @@ -206,12 +208,14 @@ def enum_preview_denoiser(self, context): items += oidn_items return items + def enum_denoiser(self, context): items = [('NLM', "NLM", "Cycles native non-local means denoiser, running on any compute device", 1)] items += enum_optix_denoiser(self, context) items += enum_openimagedenoise_denoiser(self, context) return items + enum_denoising_input_passes = ( ('RGB', "Color", "Use only color as input", 1), ('RGB_ALBEDO', "Color + Albedo", "Use color and albedo data as input", 2), @@ -1325,6 +1329,7 @@ class CyclesAOVPass(bpy.types.PropertyGroup): default="" ) + class CyclesRenderLayerSettings(bpy.types.PropertyGroup): pass_debug_bvh_traversed_nodes: BoolProperty( @@ -1644,7 +1649,6 @@ class CyclesPreferences(bpy.types.AddonPreferences): col.label(text="OptiX support is experimental", icon='INFO') col.label(text="Not all Cycles features are supported yet", icon='BLANK1') - def draw_impl(self, layout, context): row = layout.row() row.prop(self, "compute_device_type", expand=True) |