forked from bartvdbraak/blender
clear some pep8 warnings
This commit is contained in:
parent
6e66bfe110
commit
80de1162ee
@ -348,7 +348,7 @@ def smpte_from_seconds(time, fps=None):
|
||||
hours = minutes = seconds = frames = 0
|
||||
|
||||
if time < 0:
|
||||
time = -time
|
||||
time = - time
|
||||
neg = "-"
|
||||
else:
|
||||
neg = ""
|
||||
@ -361,10 +361,10 @@ def smpte_from_seconds(time, fps=None):
|
||||
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):
|
||||
'''
|
||||
@ -380,4 +380,3 @@ def smpte_from_frame(frame, fps=None, fps_base=None):
|
||||
fps_base = _bpy.context.scene.render.fps_base
|
||||
|
||||
return smpte_from_seconds((frame * fps_base) / fps, fps)
|
||||
|
@ -200,8 +200,8 @@ class InfoPropertyRNA:
|
||||
|
||||
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 @@ class InfoPropertyRNA:
|
||||
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":
|
||||
|
@ -22,6 +22,7 @@ import bpy
|
||||
|
||||
from bpy.props import *
|
||||
|
||||
|
||||
class SequencerCrossfadeSounds(bpy.types.Operator):
|
||||
'''Do crossfading volume animation of two selected sound strips.'''
|
||||
|
||||
@ -95,16 +96,17 @@ class SequencerCutMulticam(bpy.types.Operator):
|
||||
|
||||
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 @@ class SequencerDeinterlaceSelectedMovies(bpy.types.Operator):
|
||||
for s in context.scene.sequence_editor.sequences_all:
|
||||
if s.selected and s.type == 'MOVIE':
|
||||
s.de_interlace = True
|
||||
|
||||
return {'FINISHED'}
|
||||
|
||||
return {'FINISHED'}
|
||||
|
||||
|
||||
def register():
|
||||
register = bpy.types.register
|
||||
|
||||
|
||||
register(SequencerCrossfadeSounds)
|
||||
register(SequencerCutMulticam)
|
||||
register(SequencerDeinterlaceSelectedMovies)
|
||||
@ -137,7 +138,7 @@ def register():
|
||||
|
||||
def unregister():
|
||||
unregister = bpy.types.unregister
|
||||
|
||||
|
||||
unregister(SequencerCrossfadeSounds)
|
||||
unregister(SequencerCutMulticam)
|
||||
unregister(SequencerDeinterlaceSelectedMovies)
|
||||
|
@ -23,6 +23,8 @@ import bpy
|
||||
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 @@ def point_cache_ui(self, context, cache, enabled, cachetype):
|
||||
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 @@ def point_cache_ui(self, context, cache, enabled, cachetype):
|
||||
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
|
||||
|
||||
|
@ -19,6 +19,7 @@
|
||||
# <pep8 compliant>
|
||||
import bpy
|
||||
|
||||
|
||||
def act_strip(context):
|
||||
try:
|
||||
return context.scene.sequence_editor.active_strip
|
||||
|
@ -286,7 +286,7 @@ class TEXT_MT_toolbox(bpy.types.Menu):
|
||||
layout.operator("text.paste")
|
||||
|
||||
layout.separator()
|
||||
|
||||
|
||||
layout.operator("text.run_script")
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user