Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2014-09-17 12:36:17 +0400
committerCampbell Barton <ideasman42@gmail.com>2014-09-17 12:36:17 +0400
commit0e0e528ea4f9529a549ab50a6a2da7a3187258a8 (patch)
tree665ad9cb332268f7639e00ad665bbdf8d14a7a8b /release/scripts/startup/bl_ui
parentf0f398dcf3101079f4965185eb82c23c54fc6923 (diff)
Cleanup: pep8
Diffstat (limited to 'release/scripts/startup/bl_ui')
-rw-r--r--release/scripts/startup/bl_ui/properties_grease_pencil_common.py1
-rw-r--r--release/scripts/startup/bl_ui/properties_object.py1
-rw-r--r--release/scripts/startup/bl_ui/properties_paint_common.py4
-rw-r--r--release/scripts/startup/bl_ui/space_clip.py2
-rw-r--r--release/scripts/startup/bl_ui/space_sequencer.py5
-rw-r--r--release/scripts/startup/bl_ui/space_userpref.py1
-rw-r--r--release/scripts/startup/bl_ui/space_view3d.py4
-rw-r--r--release/scripts/startup/bl_ui/space_view3d_toolbar.py3
8 files changed, 7 insertions, 14 deletions
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 5dd1f94747c..4789d119192 100644
--- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
+++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
@@ -47,4 +47,3 @@ class GreasePencilPanel():
col.label(text="Measure:")
col.operator("view3d.ruler")
-
diff --git a/release/scripts/startup/bl_ui/properties_object.py b/release/scripts/startup/bl_ui/properties_object.py
index e6d6a3952ea..25367a58a54 100644
--- a/release/scripts/startup/bl_ui/properties_object.py
+++ b/release/scripts/startup/bl_ui/properties_object.py
@@ -151,6 +151,7 @@ class OBJECT_PT_relations(ObjectButtonsPanel, Panel):
sub.prop_search(ob, "parent_bone", parent.data, "bones", text="")
sub.active = (parent is not None)
+
class GROUP_MT_specials(Menu):
bl_label = "Group Specials"
diff --git a/release/scripts/startup/bl_ui/properties_paint_common.py b/release/scripts/startup/bl_ui/properties_paint_common.py
index 5c758b6568b..113fee19e2c 100644
--- a/release/scripts/startup/bl_ui/properties_paint_common.py
+++ b/release/scripts/startup/bl_ui/properties_paint_common.py
@@ -183,14 +183,10 @@ def brush_texpaint_common(panel, context, layout, brush, settings, projpaint=Fal
col.template_ID(settings, "clone_image")
col.label("UV Map")
col.menu("VIEW3D_MT_tools_projectpaint_clone", text=clone_text, translate=False)
-
-
else:
col.prop(brush, "clone_image", text="Image")
col.prop(brush, "clone_alpha", text="Alpha")
-
-
col.separator()
if capabilities.has_radius:
diff --git a/release/scripts/startup/bl_ui/space_clip.py b/release/scripts/startup/bl_ui/space_clip.py
index 13aad4c3888..3382633af60 100644
--- a/release/scripts/startup/bl_ui/space_clip.py
+++ b/release/scripts/startup/bl_ui/space_clip.py
@@ -260,7 +260,7 @@ class CLIP_PT_tools_marker(CLIP_PT_tracking_panel, Panel):
def draw(self, context):
layout = self.layout
- sc = context.space_data
+ # sc = context.space_data
# clip = sc.clip
col = layout.column(align=True)
diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py
index bbb1e41beb1..ce00d4eb8e7 100644
--- a/release/scripts/startup/bl_ui/space_sequencer.py
+++ b/release/scripts/startup/bl_ui/space_sequencer.py
@@ -215,7 +215,7 @@ class SEQUENCER_MT_select(Menu):
op = layout.operator("sequencer.select", text="All strips to the Right")
op.left_right = 'RIGHT'
op.linked_time = True
-
+
layout.separator()
layout.operator("sequencer.select_handles", text="Surrounding Handles").side = 'BOTH'
layout.operator("sequencer.select_handles", text="Left Handle").side = 'LEFT'
@@ -259,6 +259,7 @@ class SEQUENCER_MT_frame(Menu):
layout.operator("anim.previewrange_clear")
layout.operator("anim.previewrange_set")
+
class SEQUENCER_MT_add(Menu):
bl_label = "Add"
@@ -607,7 +608,7 @@ class SEQUENCER_PT_effect(SequencerButtonsPanel, Panel):
col = layout.column(align=True)
if strip.type == 'SPEED':
col.prop(strip, "multiply_speed")
- elif strip.type in {'CROSS', 'GAMMA_CROSS', 'WIPE', 'ALPHA_OVER','ALPHA_UNDER','OVER_DROP'}:
+ elif strip.type in {'CROSS', 'GAMMA_CROSS', 'WIPE', 'ALPHA_OVER', 'ALPHA_UNDER', 'OVER_DROP'}:
col.prop(strip, "use_default_fade", "Default fade")
if not strip.use_default_fade:
col.prop(strip, "effect_fader", text="Effect fader")
diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py
index 999e41e17f7..59b842a7a5b 100644
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@ -424,7 +424,6 @@ class USERPREF_PT_system(Panel):
col.prop(system, "use_gpu_mipmap")
col.prop(system, "use_16bit_textures")
-
if system.is_occlusion_query_supported():
col.separator()
col.label(text="Selection")
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 61d359ebdac..1e2fac17e90 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -2198,7 +2198,6 @@ class VIEW3D_MT_edit_mesh_edges(Menu):
layout = self.layout
with_freestyle = bpy.app.build_options.freestyle
- scene = context.scene
layout.operator_context = 'INVOKE_REGION_WIN'
@@ -2254,7 +2253,6 @@ class VIEW3D_MT_edit_mesh_faces(Menu):
layout = self.layout
with_freestyle = bpy.app.build_options.freestyle
- scene = context.scene
layout.operator_context = 'INVOKE_REGION_WIN'
@@ -2951,7 +2949,7 @@ class VIEW3D_PT_view3d_meshdisplay(Panel):
sub = row.row(align=True)
sub.active = mesh.show_normal_vertex or mesh.show_normal_face or mesh.show_normal_loop
- sub.prop(context.scene.tool_settings, "normal_size", text="Size")
+ sub.prop(scene.tool_settings, "normal_size", text="Size")
col.separator()
split = layout.split()
diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
index 6b0c5b1e993..a483a097e8f 100644
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@ -1027,7 +1027,7 @@ class VIEW3D_PT_slots_projectpaint(View3DPanel, Panel):
col = layout.column()
col.label("Painting Mode")
- col.prop(settings, "mode", text = "")
+ col.prop(settings, "mode", text="")
col.separator()
if settings.mode == 'MATERIAL':
@@ -1064,7 +1064,6 @@ class VIEW3D_PT_slots_projectpaint(View3DPanel, Panel):
col.operator("image.save_dirty", text="Save All Images")
-
class VIEW3D_PT_stencil_projectpaint(View3DPanel, Panel):
bl_context = "imagepaint"
bl_label = "Stencil"