[Bf-blender-cvs] [61c288cee53] master: Fix timeline marker click-drag arbitrary deselection
Campbell Barton
noreply at git.blender.org
Thu Mar 3 05:34:38 CET 2022
Commit: 61c288cee53aabaaf9f9ec69ccf1ffa9053895d2
Author: Campbell Barton
Date: Thu Mar 3 15:20:27 2022 +1100
Branches: master
https://developer.blender.org/rB61c288cee53aabaaf9f9ec69ccf1ffa9053895d2
Fix timeline marker click-drag arbitrary deselection
The logic to cycle selected markers wasn't cycling back to the beginning
of the list.
The marker after the selected marker at the cursor frame was also used
to check if a selection existed, causing dragging to transform all
selected markers to de-select all when when dragging the last marker.
===================================================================
M source/blender/editors/animation/anim_markers.c
===================================================================
diff --git a/source/blender/editors/animation/anim_markers.c b/source/blender/editors/animation/anim_markers.c
index 95125516fe8..c8f3501fbce 100644
--- a/source/blender/editors/animation/anim_markers.c
+++ b/source/blender/editors/animation/anim_markers.c
@@ -1146,7 +1146,7 @@ static int select_timeline_marker_frame(ListBase *markers,
for (marker = markers->first; marker; marker = marker->next) {
if (marker->frame == frame) {
if (marker->flag & SELECT) {
- marker_selected = marker->next;
+ marker_selected = marker->next ? marker->next : markers->first;
break;
}
}
More information about the Bf-blender-cvs
mailing list