[Bf-blender-cvs] [200dd87] master: Cleanup: pep8 & redundant vars
Campbell Barton
noreply at git.blender.org
Tue Jul 22 04:04:05 CEST 2014
Commit: 200dd87de1726d7b6f61b9cfa3b2beea6ceba6cd
Author: Campbell Barton
Date: Tue Jul 22 12:03:15 2014 +1000
Branches: master
https://developer.blender.org/rB200dd87de1726d7b6f61b9cfa3b2beea6ceba6cd
Cleanup: pep8 & redundant vars
===================================================================
M build_files/buildbot/master.cfg
M doc/manpage/blender.1.py
M intern/cycles/blender/addon/engine.py
M intern/cycles/blender/addon/ui.py
M release/scripts/modules/rna_prop_ui.py
M release/scripts/startup/bl_operators/object.py
M release/scripts/startup/bl_ui/properties_texture.py
M release/scripts/startup/bl_ui/space_clip.py
M release/scripts/startup/bl_ui/space_sequencer.py
M release/scripts/startup/bl_ui/space_view3d_toolbar.py
M tests/python/bl_mesh_modifiers.py
===================================================================
diff --git a/build_files/buildbot/master.cfg b/build_files/buildbot/master.cfg
index 4480b7e..07b8216 100644
--- a/build_files/buildbot/master.cfg
+++ b/build_files/buildbot/master.cfg
@@ -95,7 +95,7 @@ def schedule_force_build(name):
revision=forcesched.FixedParameter(name="revision", default=""),
repository=forcesched.FixedParameter(name="repository", default=""),
project=forcesched.FixedParameter(name="project", default=""),
- properties=[]))
+ properties=[]))
def schedule_build(name, hour, minute=0):
diff --git a/doc/manpage/blender.1.py b/doc/manpage/blender.1.py
index 32e8cc0..77f5c5e 100755
--- a/doc/manpage/blender.1.py
+++ b/doc/manpage/blender.1.py
@@ -31,7 +31,6 @@ and <output-filename> is where to write the generated man page.
# <pep8 compliant>
import subprocess
-import os
import sys
import time
diff --git a/intern/cycles/blender/addon/engine.py b/intern/cycles/blender/addon/engine.py
index 21a92a2..18235ec 100644
--- a/intern/cycles/blender/addon/engine.py
+++ b/intern/cycles/blender/addon/engine.py
@@ -65,6 +65,7 @@ def bake(engine, obj, pass_type, pixel_array, num_pixels, depth, result):
if session is not None:
_cycles.bake(engine.session, obj.as_pointer(), pass_type, pixel_array.as_pointer(), num_pixels, depth, result.as_pointer())
+
def reset(engine, data, scene):
import _cycles
data = data.as_pointer()
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py
index 35ae8ec..4a13f26 100644
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@ -1244,13 +1244,13 @@ class CyclesRender_PT_bake(CyclesButtonsPanel, Panel):
scene = context.scene
cscene = scene.cycles
cbk = scene.render.bake
-
+
layout.operator("object.bake", icon='RENDER_STILL').type = cscene.bake_type
-
+
col = layout.column()
col.prop(cscene, "bake_type")
col.separator()
-
+
split = layout.split()
col = split.column()
diff --git a/release/scripts/modules/rna_prop_ui.py b/release/scripts/modules/rna_prop_ui.py
index e9c96d5..e278b0d 100644
--- a/release/scripts/modules/rna_prop_ui.py
+++ b/release/scripts/modules/rna_prop_ui.py
@@ -57,6 +57,7 @@ def rna_idprop_ui_prop_clear(item, prop):
except:
pass
+
def rna_idprop_context_value(context, context_member, property_type):
space = context.space_data
@@ -73,11 +74,13 @@ def rna_idprop_context_value(context, context_member, property_type):
return rna_item, context_member
+
def rna_idprop_has_properties(rna_item):
keys = rna_item.keys()
nbr_props = len(keys)
return (nbr_props > 1) or (nbr_props and '_RNA_UI' not in keys)
+
def draw(layout, context, context_member, property_type, use_edit=True):
def assign_props(prop, val, key):
diff --git a/release/scripts/startup/bl_operators/object.py b/release/scripts/startup/bl_operators/object.py
index 29b75e6..d1d2341 100644
--- a/release/scripts/startup/bl_operators/object.py
+++ b/release/scripts/startup/bl_operators/object.py
@@ -249,9 +249,9 @@ class SubdivisionSet(Operator):
if mod.type == 'MULTIRES':
if not relative:
if level > mod.total_levels:
- sub = level - mod.total_levels
- for i in range (0, sub):
- bpy.ops.object.multires_subdivide(modifier="Multires")
+ sub = level - mod.total_levels
+ for i in range (0, sub):
+ bpy.ops.object.multires_subdivide(modifier="Multires")
if obj.mode == 'SCULPT':
if mod.sculpt_levels != level:
diff --git a/release/scripts/startup/bl_ui/properties_texture.py b/release/scripts/startup/bl_ui/properties_texture.py
index 626cdaa..faf0d4c 100644
--- a/release/scripts/startup/bl_ui/properties_texture.py
+++ b/release/scripts/startup/bl_ui/properties_texture.py
@@ -1172,7 +1172,6 @@ class TEXTURE_PT_influence(TextureSlotPanel, Panel):
col = split.column()
factor_but(col, "use_map_alpha", "alpha_factor", "Alpha")
-
layout.separator()
if not isinstance(idblock, ParticleSettings):
diff --git a/release/scripts/startup/bl_ui/space_clip.py b/release/scripts/startup/bl_ui/space_clip.py
index 96ad70e..13aad4c 100644
--- a/release/scripts/startup/bl_ui/space_clip.py
+++ b/release/scripts/startup/bl_ui/space_clip.py
@@ -261,7 +261,7 @@ class CLIP_PT_tools_marker(CLIP_PT_tracking_panel, Panel):
layout = self.layout
sc = context.space_data
- clip = sc.clip
+ # clip = sc.clip
col = layout.column(align=True)
row = col.row(align=True)
diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py
index 978c326..95384c1 100644
--- a/release/scripts/startup/bl_ui/space_sequencer.py
+++ b/release/scripts/startup/bl_ui/space_sequencer.py
@@ -160,14 +160,14 @@ class SEQUENCER_MT_view(Menu):
if st.view_type in {'PREVIEW', 'SEQUENCER_PREVIEW'}:
layout.operator_context = 'INVOKE_REGION_PREVIEW'
layout.operator("sequencer.view_all_preview", text="Fit preview in window")
-
+
layout.separator()
-
+
ratios = ((1, 8), (1, 4), (1, 2), (1, 1), (2, 1), (4, 1), (8, 1))
for a, b in ratios:
layout.operator("sequencer.view_zoom_ratio", text=iface_("Zoom %d:%d") % (a, b), translate=False).ratio = a / b
-
+
layout.separator()
layout.operator_context = 'INVOKE_DEFAULT'
diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
index 256110a..5e7e91c 100644
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@ -1036,7 +1036,7 @@ class VIEW3D_PT_tools_brush(Panel, View3DPaintPanel):
class TEXTURE_UL_texpaintslots(UIList):
def draw_item(self, context, layout, data, item, icon, active_data, active_propname, index):
- ma = data
+ # ma = data
ima = item
if self.layout_type in {'DEFAULT', 'COMPACT'}:
@@ -1061,7 +1061,7 @@ class VIEW3D_PT_slots_projectpaint(View3DPanel, Panel):
layout = self.layout
settings = context.tool_settings.image_paint
- brush = settings.brush
+ # brush = settings.brush
ob = context.active_object
col = layout.column()
@@ -1383,7 +1383,7 @@ class VIEW3D_PT_sculpt_options(Panel, View3DPaintPanel):
def draw(self, context):
layout = self.layout
- scene = context.scene
+ # scene = context.scene
toolsettings = context.tool_settings
sculpt = toolsettings.sculpt
@@ -1604,7 +1604,7 @@ class VIEW3D_PT_tools_projectpaint(View3DPaintPanel, Panel):
mesh = ob.data
toolsettings = context.tool_settings
ipaint = toolsettings.image_paint
- settings = toolsettings.image_paint
+ # settings = toolsettings.image_paint
col = layout.column()
diff --git a/tests/python/bl_mesh_modifiers.py b/tests/python/bl_mesh_modifiers.py
index b3f77ae..1c05eaa 100644
--- a/tests/python/bl_mesh_modifiers.py
+++ b/tests/python/bl_mesh_modifiers.py
@@ -434,11 +434,6 @@ def modifier_hook_add(scene, obj, use_vgroup=True):
for v in mesh.vertices:
v.select = False
- if IS_BMESH:
- face_verts = mesh_bmesh_poly_vertices(mesh.polygons[0])
- else:
- face_verts = mesh.faces[0].vertices[:]
-
for i in mesh.faces[0].vertices:
mesh.vertices[i].select = True
More information about the Bf-blender-cvs
mailing list