[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28790] trunk/blender/release/scripts: clear some pep8 warnings
Campbell Barton
ideasman42 at gmail.com
Sun May 16 14:15:04 CEST 2010
Revision: 28790
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28790
Author: campbellbarton
Date: 2010-05-16 14:15:04 +0200 (Sun, 16 May 2010)
Log Message:
-----------
clear some pep8 warnings
Modified Paths:
--------------
trunk/blender/release/scripts/modules/bpy/utils.py
trunk/blender/release/scripts/modules/rna_info.py
trunk/blender/release/scripts/op/sequencer.py
trunk/blender/release/scripts/ui/properties_physics_common.py
trunk/blender/release/scripts/ui/space_sequencer.py
trunk/blender/release/scripts/ui/space_text.py
Modified: trunk/blender/release/scripts/modules/bpy/utils.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy/utils.py 2010-05-16 11:43:48 UTC (rev 28789)
+++ trunk/blender/release/scripts/modules/bpy/utils.py 2010-05-16 12:15:04 UTC (rev 28790)
@@ -348,7 +348,7 @@
hours = minutes = seconds = frames = 0
if time < 0:
- time = -time
+ time = - time
neg = "-"
else:
neg = ""
@@ -361,11 +361,11 @@
time = time % 60.0
seconds = int(time)
- frames= int(round(math.floor( ((time - seconds) * fps))))
+ frames= int(round(math.floor(((time - seconds) * fps))))
return "%s%02d:%02d:%02d:%02d" % (neg, hours, minutes, seconds, frames)
-
+
def smpte_from_frame(frame, fps=None, fps_base=None):
'''
Returns an SMPTE formatted string from the frame: "HH:MM:SS:FF".
@@ -380,4 +380,3 @@
fps_base = _bpy.context.scene.render.fps_base
return smpte_from_seconds((frame * fps_base) / fps, fps)
-
\ No newline at end of file
Modified: trunk/blender/release/scripts/modules/rna_info.py
===================================================================
--- trunk/blender/release/scripts/modules/rna_info.py 2010-05-16 11:43:48 UTC (rev 28789)
+++ trunk/blender/release/scripts/modules/rna_info.py 2010-05-16 12:15:04 UTC (rev 28790)
@@ -200,8 +200,8 @@
if self.type == "enum":
self.enum_items[:] = rna_prop.items.keys()
-
-
+
+
if self.array_length:
self.default = tuple(getattr(rna_prop, "default_array", ()))
else:
@@ -245,7 +245,7 @@
type_str += self.type
if self.array_length:
type_str += " array of %d items" % (self.array_length)
-
+
if self.type in ("float", "int"):
type_str += " in [%s, %s]" % (range_str(self.min), range_str(self.max))
elif self.type == "enum":
Modified: trunk/blender/release/scripts/op/sequencer.py
===================================================================
--- trunk/blender/release/scripts/op/sequencer.py 2010-05-16 11:43:48 UTC (rev 28789)
+++ trunk/blender/release/scripts/op/sequencer.py 2010-05-16 12:15:04 UTC (rev 28790)
@@ -22,6 +22,7 @@
from bpy.props import *
+
class SequencerCrossfadeSounds(bpy.types.Operator):
'''Do crossfading volume animation of two selected sound strips.'''
@@ -95,16 +96,17 @@
if not s.selected:
s.selected = True
-
+
cfra = context.scene.frame_current
- bpy.ops.sequencer.cut(frame=cfra,type='HARD',side='RIGHT')
+ bpy.ops.sequencer.cut(frame=cfra, type='HARD', side='RIGHT')
for s in context.scene.sequence_editor.sequences_all:
if s.selected and s.type == 'MULTICAM' and s.frame_final_start <= cfra and cfra < s.frame_final_end:
context.scene.sequence_editor.active_strip = s
-
+
context.scene.sequence_editor.active_strip.multicam_source = camera
return {'FINISHED'}
+
class SequencerDeinterlaceSelectedMovies(bpy.types.Operator):
'''Deinterlace all selected movie sources.'''
@@ -122,14 +124,13 @@
for s in context.scene.sequence_editor.sequences_all:
if s.selected and s.type == 'MOVIE':
s.de_interlace = True
-
+
return {'FINISHED'}
-
def register():
register = bpy.types.register
-
+
register(SequencerCrossfadeSounds)
register(SequencerCutMulticam)
register(SequencerDeinterlaceSelectedMovies)
@@ -137,7 +138,7 @@
def unregister():
unregister = bpy.types.unregister
-
+
unregister(SequencerCrossfadeSounds)
unregister(SequencerCutMulticam)
unregister(SequencerDeinterlaceSelectedMovies)
Modified: trunk/blender/release/scripts/ui/properties_physics_common.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_physics_common.py 2010-05-16 11:43:48 UTC (rev 28789)
+++ trunk/blender/release/scripts/ui/properties_physics_common.py 2010-05-16 12:15:04 UTC (rev 28790)
@@ -23,6 +23,8 @@
narrowui = bpy.context.user_preferences.view.properties_width_check
#cachetype can be 'PSYS' 'HAIR' 'SMOKE' etc
+
+
def point_cache_ui(self, context, cache, enabled, cachetype):
layout = self.layout
@@ -68,7 +70,7 @@
sub = col.column()
sub.enabled = enabled
sub.prop(cache, "quick_cache")
-
+
sub = col.column()
sub.enabled = bpy.data.file_is_saved
sub.prop(cache, "disk_cache")
@@ -103,6 +105,7 @@
col.operator("ptcache.free_bake_all", text="Free All Bakes")
col.operator("ptcache.bake_all", text="Update All To Frame").bake = False
+
def effector_weights_ui(self, context, weights):
layout = self.layout
Modified: trunk/blender/release/scripts/ui/space_sequencer.py
===================================================================
--- trunk/blender/release/scripts/ui/space_sequencer.py 2010-05-16 11:43:48 UTC (rev 28789)
+++ trunk/blender/release/scripts/ui/space_sequencer.py 2010-05-16 12:15:04 UTC (rev 28790)
@@ -19,6 +19,7 @@
# <pep8 compliant>
import bpy
+
def act_strip(context):
try:
return context.scene.sequence_editor.active_strip
Modified: trunk/blender/release/scripts/ui/space_text.py
===================================================================
--- trunk/blender/release/scripts/ui/space_text.py 2010-05-16 11:43:48 UTC (rev 28789)
+++ trunk/blender/release/scripts/ui/space_text.py 2010-05-16 12:15:04 UTC (rev 28790)
@@ -286,7 +286,7 @@
layout.operator("text.paste")
layout.separator()
-
+
layout.operator("text.run_script")
More information about the Bf-blender-cvs
mailing list