Blender Git Loki
Git Commits -> Revision 649a2bc
Revision 649a2bc by Antonis Ryakiotakis (master) November 24, 2014, 17:23 (GMT) |
Politically correct terrible consequencer changes This patch includes the work done in the terrible consequencer branch that hasn't been merged to master minus a few controversial and WIP stuff, like strip parenting, new sequence data structs and cuddly widgets. What is included: * Strip extensions only when slipping. It can very easily be made an option but with a few strips with overlapping durations it makes view too crowded and difficult to make out. * Threaded waveform loading + code that restores waveforms on undo (not used though, since sound_load recreates everything. There's a patch for review D876) * Toggle to enable backdrop in the strip sequence editor * Toggle to easily turn on/off waveform display * Snapping during transform on sequence boundaries. Snapping to start or end of selection depends on position of mouse when invoking the operator * Snapping of timeline indicator in sequencer to strip boundaries. To use just press and hold ctrl while dragging. Reviewers: campbellbarton Differential Revision: https://developer.blender.org/D904 |
Commit Details:
Full Hash: 649a2bcc3d51cfc6f9fc237695015c87bcca7deb
Parent Commit: aa0b268
Lines Changed: +789, -288
1 Added Path:
/source/blender/editors/space_sequencer/sequencer_preview.c (+172, -0) (View)
28 Modified Paths:
/intern/audaspace/intern/AUD_C-API.cpp (+7, -2) (Diff)
/intern/audaspace/intern/AUD_C-API.h (+1, -1) (Diff)
/release/scripts/startup/bl_ui/space_sequencer.py (+6, -1) (Diff)
/source/blender/blenkernel/BKE_sequencer.h (+11, -0) (Diff)
/source/blender/blenkernel/BKE_sound.h (+1, -3) (Diff)
/source/blender/blenkernel/intern/sequencer.c (+67, -1) (Diff)
/source/blender/blenkernel/intern/sound.c (+34, -15) (Diff)
/source/blender/blenloader/intern/readblenentry.c (+7, -1) (Diff)
/source/blender/blenloader/intern/readfile.c (+56, -3) (Diff)
/source/blender/blenloader/intern/readfile.h (+3, -0) (Diff)
/source/blender/blenloader/intern/writefile.c (+1, -0) (Diff)
/source/blender/editors/animation/anim_ops.c (+24, -3) (Diff)
/source/blender/editors/space_sequencer/CMakeLists.txt (+1, -0) (Diff)
/source/blender/editors/space_sequencer/sequencer_draw.c (+112, -159) (Diff)
/source/blender/editors/space_sequencer/sequencer_edit.c (+134, -68) (Diff)
/source/blender/editors/space_sequencer/sequencer_intern.h (+7, -8) (Diff)
/source/blender/editors/space_sequencer/sequencer_ops.c (+2, -0) (Diff)
/source/blender/editors/space_sequencer/space_sequencer.c (+2, -2) (Diff)
/source/blender/editors/transform/transform.c (+14, -6) (Diff)
/source/blender/editors/transform/transform.h (+9, -0) (Diff)
/source/blender/editors/transform/transform_conversions.c (+51, -7) (Diff)
/source/blender/editors/transform/transform_snap.c (+22, -0) (Diff)
/source/blender/makesdna/DNA_sequence_types.h (+4, -3) (Diff)
/source/blender/makesdna/DNA_sound_types.h (+6, -3) (Diff)
/source/blender/makesdna/DNA_space_types.h (+10, -0) (Diff)
/source/blender/makesrna/intern/rna_sound.c (+3, -2) (Diff)
/source/blender/makesrna/intern/rna_space.c (+21, -0) (Diff)
/source/blender/windowmanager/WM_api.h (+1, -0) (Diff)
/intern/audaspace/intern/AUD_C-API.h (+1, -1) (Diff)
/release/scripts/startup/bl_ui/space_sequencer.py (+6, -1) (Diff)
/source/blender/blenkernel/BKE_sequencer.h (+11, -0) (Diff)
/source/blender/blenkernel/BKE_sound.h (+1, -3) (Diff)
/source/blender/blenkernel/intern/sequencer.c (+67, -1) (Diff)
/source/blender/blenkernel/intern/sound.c (+34, -15) (Diff)
/source/blender/blenloader/intern/readblenentry.c (+7, -1) (Diff)
/source/blender/blenloader/intern/readfile.c (+56, -3) (Diff)
/source/blender/blenloader/intern/readfile.h (+3, -0) (Diff)
/source/blender/blenloader/intern/writefile.c (+1, -0) (Diff)
/source/blender/editors/animation/anim_ops.c (+24, -3) (Diff)
/source/blender/editors/space_sequencer/CMakeLists.txt (+1, -0) (Diff)
/source/blender/editors/space_sequencer/sequencer_draw.c (+112, -159) (Diff)
/source/blender/editors/space_sequencer/sequencer_edit.c (+134, -68) (Diff)
/source/blender/editors/space_sequencer/sequencer_intern.h (+7, -8) (Diff)
/source/blender/editors/space_sequencer/sequencer_ops.c (+2, -0) (Diff)
/source/blender/editors/space_sequencer/space_sequencer.c (+2, -2) (Diff)
/source/blender/editors/transform/transform.c (+14, -6) (Diff)
/source/blender/editors/transform/transform.h (+9, -0) (Diff)
/source/blender/editors/transform/transform_conversions.c (+51, -7) (Diff)
/source/blender/editors/transform/transform_snap.c (+22, -0) (Diff)
/source/blender/makesdna/DNA_sequence_types.h (+4, -3) (Diff)
/source/blender/makesdna/DNA_sound_types.h (+6, -3) (Diff)
/source/blender/makesdna/DNA_space_types.h (+10, -0) (Diff)
/source/blender/makesrna/intern/rna_sound.c (+3, -2) (Diff)
/source/blender/makesrna/intern/rna_space.c (+21, -0) (Diff)
/source/blender/windowmanager/WM_api.h (+1, -0) (Diff)