diff options
| author | Peter Kim <pk15950@gmail.com> | 2022-09-08 07:00:43 +0300 |
|---|---|---|
| committer | Peter Kim <pk15950@gmail.com> | 2022-09-08 07:00:43 +0300 |
| commit | e83f88c951e26b01893acee4f24b40a46062a41c (patch) | |
| tree | 09f60bf7d4fc2ae1ef50668823e416fc675b252e /power_sequencer/operators/channel_offset.py | |
| parent | ec84e3294593e2e26475f18c81e847bf00dc201e (diff) | |
| parent | 0cd92169d40ae1c7e103ff269e850eaf1b901646 (diff) | |
Merge branch 'master' into xr-devxr-dev
Diffstat (limited to 'power_sequencer/operators/channel_offset.py')
| -rw-r--r-- | power_sequencer/operators/channel_offset.py | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/power_sequencer/operators/channel_offset.py b/power_sequencer/operators/channel_offset.py index b7569afa..1e9c97f7 100644 --- a/power_sequencer/operators/channel_offset.py +++ b/power_sequencer/operators/channel_offset.py @@ -1,8 +1,5 @@ # SPDX-License-Identifier: GPL-3.0-or-later -# Copyright 2016-2020 by Nathan Lovato, Daniel Oakey, Razvan Radulescu, and contributors - -# This file is part of Power Sequencer. - +# Copyright (C) 2016-2020 by Nathan Lovato, Daniel Oakey, Razvan Radulescu, and contributors from operator import attrgetter import bpy @@ -117,12 +114,11 @@ class POWER_SEQUENCER_OT_channel_offset(bpy.types.Operator): context, s.frame_final_start, s.frame_final_end, to_trim, to_delete ) - if not self.keep_selection_offset: - s.channel = comparison_function(limit_channel, s.channel + channel_offset) - if s.channel == limit_channel: - move_selection(context, [s], 0, 0) + s.channel = comparison_function(limit_channel, s.channel + channel_offset) + if s.channel == limit_channel: + move_selection(context, [s], 0, 0) - if self.keep_selection_offset: + if self.keep_selection_offset and not self.trim_target_channel: start_frame = head.frame_final_start x_difference = 0 while not head.channel == limit_channel: |