archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

rna naming, *_frame --> frame_*

Browse Source
This commit is contained in:
Campbell Barton
2010-04-01 21:44:56 +00:00
parent 4924654b03
commit 9105f6f0bd
41 changed files with 193 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
release/scripts/op/sequencer.py
View File

@@ -49,22 +49,22 @@ class SequencerCrossfadeSounds(bpy.types.Operator):
if seq2 == None:
self.report({'ERROR'}, "Select 2 sound strips.")
return {'CANCELLED'}
if seq1.start_frame_final > seq2.start_frame_final:
if seq1.frame_final_start > seq2.frame_final_start:
s = seq1
seq1 = seq2
seq2 = s
if seq1.end_frame_final > seq2.start_frame_final:
tempcfra = context.scene.current_frame
context.scene.current_frame = seq2.start_frame_final
if seq1.frame_final_end > seq2.frame_final_start:
tempcfra = context.scene.frame_current
context.scene.frame_current = seq2.frame_final_start
seq1.keyframe_insert('volume')
context.scene.current_frame = seq1.end_frame_final
context.scene.frame_current = seq1.frame_final_end
seq1.volume = 0
seq1.keyframe_insert('volume')
seq2.keyframe_insert('volume')
context.scene.current_frame = seq2.start_frame_final
context.scene.frame_current = seq2.frame_final_start
seq2.volume = 0
seq2.keyframe_insert('volume')
context.scene.current_frame = tempcfra
context.scene.frame_current = tempcfra
return {'FINISHED'}
else:
self.report({'ERROR'}, "The selected strips don't overlap.")