[Bf-blender-cvs] [a0cde8ed081] blender2.8: Cleanup: unused vars
Campbell Barton
noreply at git.blender.org
Sun Nov 25 23:28:35 CET 2018
Commit: a0cde8ed08190889eebdcf7f466512497e22f94d
Author: Campbell Barton
Date: Mon Nov 26 09:26:38 2018 +1100
Branches: blender2.8
https://developer.blender.org/rBa0cde8ed08190889eebdcf7f466512497e22f94d
Cleanup: unused vars
===================================================================
M intern/cycles/blender/addon/engine.py
M intern/cycles/blender/addon/properties.py
M intern/cycles/blender/addon/ui.py
===================================================================
diff --git a/intern/cycles/blender/addon/engine.py b/intern/cycles/blender/addon/engine.py
index 0b74150f981..28b92edf489 100644
--- a/intern/cycles/blender/addon/engine.py
+++ b/intern/cycles/blender/addon/engine.py
@@ -81,7 +81,7 @@ def _parse_command_line():
return
parser = _configure_argument_parser()
- args, unknown = parser.parse_known_args(argv[argv.index("--") + 1:])
+ args, _ = parser.parse_known_args(argv[argv.index("--") + 1:])
if args.cycles_resumable_num_chunks is not None:
if args.cycles_resumable_current_chunk is not None:
@@ -256,8 +256,6 @@ def register_passes(engine, scene, srl):
if crl.use_pass_volume_direct: engine.register_pass(scene, srl, "VolumeDir", 3, "RGB", 'COLOR')
if crl.use_pass_volume_indirect: engine.register_pass(scene, srl, "VolumeInd", 3, "RGB", 'COLOR')
- cscene = scene.cycles
-
if crl.use_pass_crypto_object:
for i in range(0, crl.pass_crypto_depth, 2):
engine.register_pass(scene, srl, "CryptoObject" + '{:02d}'.format(i), 4, "RGBA", 'COLOR')
diff --git a/intern/cycles/blender/addon/properties.py b/intern/cycles/blender/addon/properties.py
index 0d68138ffb4..3de11a1c701 100644
--- a/intern/cycles/blender/addon/properties.py
+++ b/intern/cycles/blender/addon/properties.py
@@ -839,8 +839,6 @@ class CyclesCameraSettings(bpy.types.PropertyGroup):
@classmethod
def register(cls):
- import math
-
bpy.types.Camera.cycles = PointerProperty(
name="Cycles Camera Settings",
description="Cycles camera settings",
@@ -1226,8 +1224,6 @@ class CyclesCurveRenderSettings(bpy.types.PropertyGroup):
def update_render_passes(self, context):
- scene = context.scene
- rd = scene.render
view_layer = context.view_layer
view_layer.update_render_passes()
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py
index e0bea93e1c2..7fef443bf8a 100644
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@ -23,7 +23,6 @@ import _cycles
from bpy.types import (
Panel,
- Menu,
Operator,
)
@@ -328,7 +327,6 @@ class CYCLES_RENDER_PT_hair(CyclesButtonsPanel, Panel):
def draw_header(self, context):
layout = self.layout
scene = context.scene
- cscene = scene.cycles
ccscene = scene.cycles_curves
layout.prop(ccscene, "use_curves", text="")
@@ -339,7 +337,6 @@ class CYCLES_RENDER_PT_hair(CyclesButtonsPanel, Panel):
layout.use_property_decorate = False
scene = context.scene
- cscene = scene.cycles
ccscene = scene.cycles_curves
layout.active = ccscene.use_curves
@@ -369,7 +366,6 @@ class CYCLES_RENDER_PT_volumes(CyclesButtonsPanel, Panel):
scene = context.scene
cscene = scene.cycles
- ccscene = scene.cycles_curves
col = layout.column()
col.prop(cscene, "volume_step_size", text="Step Size")
@@ -485,7 +481,6 @@ class CYCLES_RENDER_PT_motion_blur_curve(CyclesButtonsPanel, Panel):
layout.use_property_decorate = False
scene = context.scene
- cscene = scene.cycles
rd = scene.render
layout.active = rd.use_motion_blur
@@ -524,7 +519,6 @@ class CYCLES_RENDER_PT_film_transparency(CyclesButtonsPanel, Panel):
def draw_header(self, context):
layout = self.layout
- rd = context.scene.render
scene = context.scene
cscene = scene.cycles
@@ -584,7 +578,6 @@ class CYCLES_RENDER_PT_performance_threads(CyclesButtonsPanel, Panel):
scene = context.scene
rd = scene.render
- cscene = scene.cycles
col = layout.column()
@@ -632,7 +625,6 @@ class CYCLES_RENDER_PT_performance_acceleration_structure(CyclesButtonsPanel, Pa
layout.use_property_decorate = False
scene = context.scene
- rd = scene.render
cscene = scene.cycles
col = layout.column()
@@ -661,7 +653,6 @@ class CYCLES_RENDER_PT_performance_final_render(CyclesButtonsPanel, Panel):
scene = context.scene
rd = scene.render
- cscene = scene.cycles
col = layout.column()
@@ -785,7 +776,6 @@ class CYCLES_RENDER_PT_passes_light(CyclesButtonsPanel, Panel):
layout.use_property_split = True
layout.use_property_decorate = False
- scene = context.scene
view_layer = context.view_layer
cycles_view_layer = view_layer.cycles
@@ -894,7 +884,6 @@ class CYCLES_RENDER_PT_denoising(CyclesButtonsPanel, Panel):
scene = context.scene
view_layer = context.view_layer
cycles_view_layer = view_layer.cycles
- cscene = scene.cycles
layout = self.layout
layout.prop(cycles_view_layer, "use_denoising", text="")
@@ -905,7 +894,6 @@ class CYCLES_RENDER_PT_denoising(CyclesButtonsPanel, Panel):
layout.use_property_decorate = False
scene = context.scene
- cscene = scene.cycles
view_layer = context.view_layer
cycles_view_layer = view_layer.cycles
@@ -999,8 +987,6 @@ class CYCLES_CAMERA_PT_dof(CyclesButtonsPanel, Panel):
layout.use_property_split = True
cam = context.camera
- ccam = cam.cycles
- dof_options = cam.gpu_dof
split = layout.split()
@@ -1027,7 +1013,6 @@ class CYCLES_CAMERA_PT_dof_aperture(CyclesButtonsPanel, Panel):
cam = context.camera
ccam = cam.cycles
- dof_options = cam.gpu_dof
col = flow.column()
col.prop(ccam, "aperture_type")
@@ -1200,7 +1185,6 @@ class CYCLES_OBJECT_PT_cycles_settings_ray_visibility(CyclesButtonsPanel, Panel)
layout.use_property_decorate = False
scene = context.scene
- cscene = scene.cycles
ob = context.object
cob = ob.cycles
visibility = ob.cycles_visibility
@@ -1247,7 +1231,6 @@ class CYCLES_OBJECT_PT_cycles_settings_performance(CyclesButtonsPanel, Panel):
cscene = scene.cycles
ob = context.object
cob = ob.cycles
- visibility = ob.cycles_visibility
flow = layout.grid_flow(row_major=True, columns=0, even_columns=True, even_rows=False, align=False)
@@ -1551,11 +1534,7 @@ class CYCLES_WORLD_PT_settings(CyclesButtonsPanel, Panel):
layout.use_property_split = True
layout.use_property_decorate = False
- world = context.world
- cworld = world.cycles
- # cscene = context.scene.cycles
-
- col = layout.column()
+ layout.column()
class CYCLES_WORLD_PT_settings_surface(CyclesButtonsPanel, Panel):
@@ -1695,7 +1674,6 @@ class CYCLES_MATERIAL_PT_settings(CyclesButtonsPanel, Panel):
layout.use_property_decorate = False
mat = context.material
- cmat = mat.cycles
layout.prop(mat, "pass_index")
More information about the Bf-blender-cvs
mailing list