From 8113863fc90cf14ddae446f479c3081da18088a6 Mon Sep 17 00:00:00 2001 From: Nathan Lovato <12694995+NathanLovato@users.noreply.github.com> Date: Wed, 27 Jul 2022 16:50:17 +0200 Subject: [PATCH] chore: format code, update release script, update changelog --- CHANGELOG.md | 12 +++++++++++- make_release.fish | 2 +- operators/expand_to_surrounding_cuts.py | 6 +++++- operators/fade_add.py | 5 ++++- operators/fade_clear.py | 6 +++++- operators/snap.py | 6 +++++- operators/snap_selection.py | 6 +++++- operators/speed_up_movie_strip.py | 18 +++++++++++++++--- operators/utils/functions.py | 4 ++-- 9 files changed, 53 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1af749a..f4c66c0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,17 @@ This document lists new features, improvements, changes, and bug fixes in every ## Power Sequencer 2.0.2 -- Fix strips not being deleted with _Channel Offset_. +This release makes power sequencer compatible with the latest version of Blender. + +### Bug fixes + +- Fix error when calling grab sequence handles due to type mismatch +- Remove FAST and FASTER playback speeds, simplify playback speed code +- Rewrite select_all_left_or_right after API change causing error +- Fix error with jump_to_cut when encountering animation frames +- Fix jump_to_cut skipping some strip ends when moving forward in time +- Jump_to_cut sometimes not working when going left +- Fix error when trimming effect strips ## Power Sequencer 2.0.1 diff --git a/make_release.fish b/make_release.fish index 196461d..576bbc9 100755 --- a/make_release.fish +++ b/make_release.fish @@ -1,6 +1,6 @@ #!/usr/bin/env fish -set blender_addons_repo $HOME/Repositories/applications/blender-git/blender/release/scripts/addons/ +set blender_addons_repo $HOME/Repositories/applications/blender-addons/ set out_path power_sequencer function make_release diff --git a/operators/expand_to_surrounding_cuts.py b/operators/expand_to_surrounding_cuts.py index 53de8bf..222f9b1 100644 --- a/operators/expand_to_surrounding_cuts.py +++ b/operators/expand_to_surrounding_cuts.py @@ -33,7 +33,11 @@ class POWER_SEQUENCER_OT_expand_to_surrounding_cuts(bpy.types.Operator): "demo": "", "description": doc_description(__doc__), "shortcuts": [ - ({"type": "E", "value": "PRESS", "ctrl": True}, {}, "Expand to Surrounding Cuts",) + ( + {"type": "E", "value": "PRESS", "ctrl": True}, + {}, + "Expand to Surrounding Cuts", + ) ], "keymap": "Sequencer", } diff --git a/operators/fade_add.py b/operators/fade_add.py index dd75c86..c798882 100644 --- a/operators/fade_add.py +++ b/operators/fade_add.py @@ -51,7 +51,10 @@ class POWER_SEQUENCER_OT_fade_add(bpy.types.Operator): bl_options = {"REGISTER", "UNDO"} duration_seconds: bpy.props.FloatProperty( - name="Fade Duration", description="Duration of the fade in seconds", default=1.0, min=0.01, + name="Fade Duration", + description="Duration of the fade in seconds", + default=1.0, + min=0.01, ) type: bpy.props.EnumProperty( items=[ diff --git a/operators/fade_clear.py b/operators/fade_clear.py index 0251663..daf8332 100644 --- a/operators/fade_clear.py +++ b/operators/fade_clear.py @@ -32,7 +32,11 @@ class POWER_SEQUENCER_OT_fade_clear(bpy.types.Operator): "demo": "", "description": doc_description(__doc__), "shortcuts": [ - ({"type": "F", "value": "PRESS", "alt": True, "ctrl": True}, {}, "Clear Fades",) + ( + {"type": "F", "value": "PRESS", "alt": True, "ctrl": True}, + {}, + "Clear Fades", + ) ], "keymap": "Sequencer", } diff --git a/operators/snap.py b/operators/snap.py index 13d5e66..42b029d 100644 --- a/operators/snap.py +++ b/operators/snap.py @@ -32,7 +32,11 @@ class POWER_SEQUENCER_OT_snap(bpy.types.Operator): "demo": "", "description": doc_description(__doc__), "shortcuts": [ - ({"type": "S", "value": "PRESS", "shift": True}, {}, "Snap sequences to cursor",) + ( + {"type": "S", "value": "PRESS", "shift": True}, + {}, + "Snap sequences to cursor", + ) ], "keymap": "Sequencer", } diff --git a/operators/snap_selection.py b/operators/snap_selection.py index eb2851b..d0a57e4 100644 --- a/operators/snap_selection.py +++ b/operators/snap_selection.py @@ -32,7 +32,11 @@ class POWER_SEQUENCER_OT_snap_selection(bpy.types.Operator): "demo": "", "description": doc_description(__doc__), "shortcuts": [ - ({"type": "S", "value": "PRESS", "alt": True}, {}, "Snap selection to cursor",) + ( + {"type": "S", "value": "PRESS", "alt": True}, + {}, + "Snap selection to cursor", + ) ], "keymap": "Sequencer", } diff --git a/operators/speed_up_movie_strip.py b/operators/speed_up_movie_strip.py index daa68b2..7e73791 100644 --- a/operators/speed_up_movie_strip.py +++ b/operators/speed_up_movie_strip.py @@ -35,9 +35,21 @@ class POWER_SEQUENCER_OT_speed_up_movie_strip(bpy.types.Operator): "demo": "https://i.imgur.com/ZyEd0jD.gif", "description": doc_description(__doc__), "shortcuts": [ - ({"type": "TWO", "value": "PRESS", "alt": True}, {"speed_factor": 2.0}, "Speed x2",), - ({"type": "THREE", "value": "PRESS", "alt": True}, {"speed_factor": 3.0}, "Speed x3",), - ({"type": "FOUR", "value": "PRESS", "alt": True}, {"speed_factor": 4.0}, "Speed x4",), + ( + {"type": "TWO", "value": "PRESS", "alt": True}, + {"speed_factor": 2.0}, + "Speed x2", + ), + ( + {"type": "THREE", "value": "PRESS", "alt": True}, + {"speed_factor": 3.0}, + "Speed x3", + ), + ( + {"type": "FOUR", "value": "PRESS", "alt": True}, + {"speed_factor": 4.0}, + "Speed x4", + ), ], "keymap": "Sequencer", } diff --git a/operators/utils/functions.py b/operators/utils/functions.py index 6c7e796..2910533 100644 --- a/operators/utils/functions.py +++ b/operators/utils/functions.py @@ -275,11 +275,11 @@ def trim_strips(context, frame_start, frame_end, to_trim, to_delete=[]): bpy.ops.sequencer.split(frame=trim_start, type="SOFT", side="RIGHT") bpy.ops.sequencer.split(frame=trim_end, type="SOFT", side="LEFT") to_delete.append(context.selected_sequences[0]) - + for c in context.sequences: if c.channel == s.channel: strips_in_target_channel.append(c) - + if s in initial_selection: initial_selection.append(strips_in_target_channel[0]) continue