diff options
author | Campbell Barton <ideasman42@gmail.com> | 2020-06-05 15:18:58 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2020-06-05 15:18:58 +0300 |
commit | b78fb8b9876837f4440573c3de4425430a07fa60 (patch) | |
tree | 2c6b9f5867d2eec1acd47fe2d969f4b32b992810 /source/blender/editors/space_sequencer | |
parent | 74fa600ede93852e031c73322a43e807d1b9daf0 (diff) |
Cleanup: remove unused sequencer marker code from 2.4x
Diffstat (limited to 'source/blender/editors/space_sequencer')
-rw-r--r-- | source/blender/editors/space_sequencer/sequencer_intern.h | 7 | ||||
-rw-r--r-- | source/blender/editors/space_sequencer/sequencer_select.c | 30 |
2 files changed, 1 insertions, 36 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_intern.h b/source/blender/editors/space_sequencer/sequencer_intern.h index 25f3d087cb2..eec8d604b64 100644 --- a/source/blender/editors/space_sequencer/sequencer_intern.h +++ b/source/blender/editors/space_sequencer/sequencer_intern.h @@ -182,13 +182,6 @@ enum { SEQ_SPLIT_SOFT, SEQ_SPLIT_HARD, }; -enum { - SEQ_SELECTED, - SEQ_UNSELECTED, -}; - -/* Defines used internally. */ -#define SCE_MARKERS 0 /* XXX - dummy */ /* sequencer_ops.c */ void sequencer_operatortypes(void); diff --git a/source/blender/editors/space_sequencer/sequencer_select.c b/source/blender/editors/space_sequencer/sequencer_select.c index 1b20cdbc782..e6cde22b40b 100644 --- a/source/blender/editors/space_sequencer/sequencer_select.c +++ b/source/blender/editors/space_sequencer/sequencer_select.c @@ -52,11 +52,6 @@ /* Own include. */ #include "sequencer_intern.h" -static void *find_nearest_marker(int UNUSED(d1), int UNUSED(d2)) -{ - return NULL; -} - static void select_surrounding_handles(Scene *scene, Sequence *test) /* XXX BRING BACK */ { Sequence *neighbor; @@ -373,7 +368,6 @@ static int sequencer_select_exec(bContext *C, wmOperator *op) Sequence *seq, *neighbor, *act_orig; int hand, sel_side; - TimeMarker *marker; if (ed == NULL) { return OPERATOR_CANCELLED; @@ -383,8 +377,6 @@ static int sequencer_select_exec(bContext *C, wmOperator *op) wait_to_deselect_others = false; } - marker = find_nearest_marker(SCE_MARKERS, 1); /* XXX - dummy function for now */ - seq = find_nearest_seq(scene, v2d, &hand, mval); /* XXX - not nice, Ctrl+RMB needs to do side_of_frame only when not over a strip */ @@ -392,28 +384,8 @@ static int sequencer_select_exec(bContext *C, wmOperator *op) side_of_frame = false; } - if (marker) { - int oldflag; - /* Select timeline marker. */ - if (extend) { - oldflag = marker->flag; - if (oldflag & SELECT) { - marker->flag &= ~SELECT; - } - else { - marker->flag |= SELECT; - } - } - else { - /* XXX, in 2.4x, seq selection used to deselect all, need to re-thnik this for 2.5 */ - /* deselect_markers(0, 0); */ - marker->flag |= SELECT; - } - - ret_value = OPERATOR_FINISHED; - } /* Select left, right or overlapping the current frame. */ - else if (side_of_frame) { + if (side_of_frame) { /* Use different logic for this. */ float x; if (extend == false) { |