[Bf-blender-cvs] [5065c0e6d5b] temp-D10103-nla_support_strip_overlap_during_transform: - apply changes to dependency patch
Wayde Moss
noreply at git.blender.org
Wed Jan 13 07:05:20 CET 2021
Commit: 5065c0e6d5bc490e030ac9f1b0a62c33f32d316a
Author: Wayde Moss
Date: Wed Jan 13 00:52:31 2021 -0500
Branches: temp-D10103-nla_support_strip_overlap_during_transform
https://developer.blender.org/rB5065c0e6d5bc490e030ac9f1b0a62c33f32d316a
- apply changes to dependency patch
===================================================================
M source/blender/editors/space_nla/nla_edit.c
===================================================================
diff --git a/source/blender/editors/space_nla/nla_edit.c b/source/blender/editors/space_nla/nla_edit.c
index 9e02d430d98..b4f24458d7e 100644
--- a/source/blender/editors/space_nla/nla_edit.c
+++ b/source/blender/editors/space_nla/nla_edit.c
@@ -1124,12 +1124,7 @@ static int nlaedit_duplicate_exec(bContext *C, wmOperator *op)
/* in case there's no space in the track above,
* or we haven't got a reference to it yet, try adding */
if (!BKE_nlatrack_try_add_strip(nlt->next, nstrip, is_liboverride)) {
- /* need to add a new track above the one above the current one
- * - if the current one is the last one, nlt->next will be NULL, which defaults to adding
- * at the top of the stack anyway...
- */
- track = BKE_nlatrack_new_after_and_set_active(
- &adt->nla_tracks, nlt->next, is_liboverride);
+ track = BKE_nlatrack_new_after_and_set_active(&adt->nla_tracks, nlt, is_liboverride);
BKE_nlatrack_add_strip(track, nstrip);
}
More information about the Bf-blender-cvs
mailing list