[Bf-blender-cvs] [b05f9e35cbc] blender2.8: Cleanup: unused variables
Campbell Barton
noreply at git.blender.org
Tue Sep 11 10:07:38 CEST 2018
Commit: b05f9e35cbc919c5b98e77bd8e52fc959f3fdd88
Author: Campbell Barton
Date: Tue Sep 11 18:15:55 2018 +1000
Branches: blender2.8
https://developer.blender.org/rBb05f9e35cbc919c5b98e77bd8e52fc959f3fdd88
Cleanup: unused variables
===================================================================
M release/scripts/startup/bl_operators/clip.py
M release/scripts/startup/bl_operators/object.py
M release/scripts/startup/bl_ui/properties_data_camera.py
M release/scripts/startup/bl_ui/properties_data_curve.py
M release/scripts/startup/bl_ui/properties_data_empty.py
M release/scripts/startup/bl_ui/properties_data_gpencil.py
M release/scripts/startup/bl_ui/properties_data_lightprobe.py
M release/scripts/startup/bl_ui/properties_freestyle.py
M release/scripts/startup/bl_ui/properties_grease_pencil_common.py
M release/scripts/startup/bl_ui/properties_particle.py
M release/scripts/startup/bl_ui/properties_render.py
M release/scripts/startup/bl_ui/properties_scene.py
M release/scripts/startup/bl_ui/properties_view_layer.py
M release/scripts/startup/bl_ui/space_outliner.py
M release/scripts/startup/bl_ui/space_toolsystem_common.py
M release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
M release/scripts/startup/bl_ui/space_view3d.py
M release/scripts/startup/bl_ui/space_view3d_toolbar.py
===================================================================
diff --git a/release/scripts/startup/bl_operators/clip.py b/release/scripts/startup/bl_operators/clip.py
index 3c9fc012eeb..065f4560ce9 100644
--- a/release/scripts/startup/bl_operators/clip.py
+++ b/release/scripts/startup/bl_operators/clip.py
@@ -662,7 +662,6 @@ class CLIP_OT_setup_tracking_scene(Operator):
else:
setup_collection_recursively(collection.children, collection_name, attr_name)
- collection = context.collection
collections = context.scene.collection.children
vlayers = context.scene.view_layers
@@ -971,7 +970,7 @@ class CLIP_OT_setup_tracking_scene(Operator):
def execute(self, context):
scene = context.scene
- current_active_layer = scene.active_layer
+ # current_active_layer = scene.active_layer
self._setupScene(context)
self._setupWorld(context)
diff --git a/release/scripts/startup/bl_operators/object.py b/release/scripts/startup/bl_operators/object.py
index 8b751ed2ebf..30a9943df71 100644
--- a/release/scripts/startup/bl_operators/object.py
+++ b/release/scripts/startup/bl_operators/object.py
@@ -171,7 +171,6 @@ class SelectHierarchy(Operator):
return context.object
def execute(self, context):
- scene = context.scene
view_layer = context.view_layer
select_new = []
act_new = None
diff --git a/release/scripts/startup/bl_ui/properties_data_camera.py b/release/scripts/startup/bl_ui/properties_data_camera.py
index e097cd269f3..ebad1d11544 100644
--- a/release/scripts/startup/bl_ui/properties_data_camera.py
+++ b/release/scripts/startup/bl_ui/properties_data_camera.py
@@ -218,7 +218,6 @@ class DATA_PT_camera_dof(CameraButtonsPanel, Panel):
layout.use_property_split = True
cam = context.camera
- dof_options = cam.gpu_dof
col = layout.column()
col.prop(cam, "dof_object", text="Focus on Object")
diff --git a/release/scripts/startup/bl_ui/properties_data_curve.py b/release/scripts/startup/bl_ui/properties_data_curve.py
index 9ba6bc70892..441c9724c53 100644
--- a/release/scripts/startup/bl_ui/properties_data_curve.py
+++ b/release/scripts/startup/bl_ui/properties_data_curve.py
@@ -358,7 +358,6 @@ class DATA_PT_font_transform(CurveButtonsPanelText, Panel):
layout = self.layout
text = context.curve
- char = context.curve.edit_format
layout.use_property_split = True
@@ -387,9 +386,8 @@ class DATA_PT_paragraph(CurveButtonsPanelText, Panel):
bl_label = "Paragraph"
def draw(self, context):
- layout = self.layout
-
- text = context.curve
+ # Parent panel
+ pass
class DATA_PT_paragraph_alignment(CurveButtonsPanelText, Panel):
diff --git a/release/scripts/startup/bl_ui/properties_data_empty.py b/release/scripts/startup/bl_ui/properties_data_empty.py
index 013921584f1..9cd5a5909ce 100644
--- a/release/scripts/startup/bl_ui/properties_data_empty.py
+++ b/release/scripts/startup/bl_ui/properties_data_empty.py
@@ -46,8 +46,7 @@ class DATA_PT_empty(DataButtonsPanel, Panel):
layout.template_ID(ob, "data", open="image.open", unlink="object.unlink_data")
layout.template_image(ob, "data", ob.image_user, compact=True)
- row = layout.row(align=True)
- row = layout.row(align=True)
+ layout.row(align=True).row(align=True)
layout.prop(ob, "color", text="Transparency", index=3, slider=True)
col = layout.column(align=True)
diff --git a/release/scripts/startup/bl_ui/properties_data_gpencil.py b/release/scripts/startup/bl_ui/properties_data_gpencil.py
index 81c9d93fce3..6ccf3d601fe 100644
--- a/release/scripts/startup/bl_ui/properties_data_gpencil.py
+++ b/release/scripts/startup/bl_ui/properties_data_gpencil.py
@@ -62,7 +62,6 @@ class DATA_PT_gpencil(DataButtonsPanel, Panel):
# Grease Pencil data selector
gpd_owner = context.gpencil_data_owner
- gpd = context.gpencil_data
layout.template_ID(gpd_owner, "data")
diff --git a/release/scripts/startup/bl_ui/properties_data_lightprobe.py b/release/scripts/startup/bl_ui/properties_data_lightprobe.py
index b1e91d298c8..84674571886 100644
--- a/release/scripts/startup/bl_ui/properties_data_lightprobe.py
+++ b/release/scripts/startup/bl_ui/properties_data_lightprobe.py
@@ -58,7 +58,6 @@ class DATA_PT_lightprobe(DataButtonsPanel, Panel):
layout = self.layout
layout.use_property_split = True
- ob = context.object
probe = context.lightprobe
# layout.prop(probe, "type")
diff --git a/release/scripts/startup/bl_ui/properties_freestyle.py b/release/scripts/startup/bl_ui/properties_freestyle.py
index 2ec80784c2e..66a71382770 100644
--- a/release/scripts/startup/bl_ui/properties_freestyle.py
+++ b/release/scripts/startup/bl_ui/properties_freestyle.py
@@ -116,7 +116,6 @@ class VIEWLAYER_PT_freestyle(ViewLayerFreestyleButtonsPanel, Panel):
def draw(self, context):
layout = self.layout
- scene = context.scene
view_layer = context.view_layer
freestyle = view_layer.freestyle_settings
@@ -183,9 +182,6 @@ class VIEWLAYER_PT_freestyle_lineset(ViewLayerFreestyleEditorButtonsPanel, Panel
def draw(self, context):
layout = self.layout
- scene = context.scene
- rd = scene.render
-
view_layer = context.view_layer
freestyle = view_layer.freestyle_settings
lineset = freestyle.linesets.active
@@ -613,7 +609,6 @@ class VIEWLAYER_PT_freestyle_linestyle(ViewLayerFreestyleEditorButtonsPanel, Pan
def draw(self, context):
layout = self.layout
- scene = context.scene
view_layer = context.view_layer
lineset = view_layer.freestyle_settings.linesets.active
diff --git a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
index 71688fc7c65..3671fcf3d68 100644
--- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
+++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
@@ -587,7 +587,6 @@ class GPENCIL_MT_gpencil_draw_specials(Menu):
def draw(self, context):
layout = self.layout
- is_3d_view = context.space_data.type == 'VIEW_3D'
layout.operator_context = 'INVOKE_REGION_WIN'
@@ -605,7 +604,6 @@ class GPENCIL_MT_gpencil_draw_delete(Menu):
def draw(self, context):
layout = self.layout
- is_3d_view = context.space_data.type == 'VIEW_3D'
layout.operator_context = 'INVOKE_REGION_WIN'
@@ -631,7 +629,6 @@ class GPENCIL_UL_annotation_layer(UIList):
def draw_item(self, context, layout, data, item, icon, active_data, active_propname, index):
# assert(isinstance(item, bpy.types.GPencilLayer)
gpl = item
- gpd = context.gpencil_data
if self.layout_type in {'DEFAULT', 'COMPACT'}:
if gpl.lock:
diff --git a/release/scripts/startup/bl_ui/properties_particle.py b/release/scripts/startup/bl_ui/properties_particle.py
index da8034761f6..a27ee0e9414 100644
--- a/release/scripts/startup/bl_ui/properties_particle.py
+++ b/release/scripts/startup/bl_ui/properties_particle.py
@@ -277,7 +277,7 @@ class PARTICLE_PT_emission(ParticleButtonsPanel, Panel):
if part.type == 'HAIR':
col.prop(part, "hair_length")
if not part.use_advanced_hair:
- row = layout.row()
+ layout.row() # is this needed?
col.prop(part, "use_modifier_stack")
return
@@ -428,7 +428,6 @@ class PARTICLE_PT_hair_dynamics_structure(ParticleButtonsPanel, Panel):
psys = context.particle_system
cloth_md = psys.cloth
cloth = cloth_md.settings
- result = cloth_md.solver_result
layout.enabled = psys.use_hair_dynamics and psys.point_cache.is_baked is False
@@ -460,7 +459,6 @@ class PARTICLE_PT_hair_dynamics_volume(ParticleButtonsPanel, Panel):
psys = context.particle_system
cloth_md = psys.cloth
cloth = cloth_md.settings
- result = cloth_md.solver_result
layout.enabled = psys.use_hair_dynamics and psys.point_cache.is_baked is False
@@ -698,7 +696,6 @@ class PARTICLE_PT_physics_fluid_advanced(ParticleButtonsPanel, Panel):
@classmethod
def poll(cls, context):
part = particle_get_settings(context)
- fluid = part.fluid
if part.physics_type == 'FLUID':
return True
else:
@@ -708,7 +705,7 @@ class PARTICLE_PT_physics_fluid_advanced(ParticleButtonsPanel, Panel):
layout = self.layout
layout.use_property_split = True
- psys = context.particle_system
+ # psys = context.particle_system
part = particle_get_settings(context)
fluid = part.fluid
@@ -758,7 +755,7 @@ class PARTICLE_PT_physics_fluid_springs(ParticleButtonsPanel, Panel):
layout = self.layout
layout.use_property_split = True
- psys = context.particle_system
+ # psys = context.particle_system
part = particle_get_settings(context)
fluid = part.fluid
@@ -783,7 +780,7 @@ class PARTICLE_PT_physics_fluid_springs_viscoelastic(ParticleButtonsPanel, Panel
return False
def draw_header(self, context):
- psys = context.particle_system
+ # psys = context.particle_system
part = particle_get_settings(context)
fluid = part.fluid
@@ -793,7 +790,7 @@ class PARTICLE_PT_physics_fluid_springs_viscoelastic(ParticleButtonsPanel, Panel
layout = self.layout
layout.use_property_split = True
- psys = context.particle_system
+ # psys = context.particle_system
part = particle_get_settings(context)
fluid = part.fluid
@@ -827,7 +824,7 @@ class PARTICLE_PT_physics_fluid_springs_advanced(ParticleButtonsPanel, Panel):
layout = self.layout
layout.use_property_split = True
- psys = context.particle_system
+ # psys = context.particle_system
part = particle_get_settings(context)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list