diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-09-19 05:14:36 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-09-19 05:14:36 +0300 |
| commit | f35e9f047a0381732a41ec331945b7a0654ee578 (patch) | |
| tree | 5be3c632483cf2bc2960b21789849af27c9b2b59 /source/blender/editors/space_sequencer/sequencer_select.c | |
| parent | 0ad183bf0289c3b9b1af0cd581bc30435cae3800 (diff) | |
| parent | bb3ec3ebafbc2c0e5d8530148a433242e0adad30 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/space_sequencer/sequencer_select.c')
| -rw-r--r-- | source/blender/editors/space_sequencer/sequencer_select.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_select.c b/source/blender/editors/space_sequencer/sequencer_select.c index 5506ccf249a..5391bacf9a1 100644 --- a/source/blender/editors/space_sequencer/sequencer_select.c +++ b/source/blender/editors/space_sequencer/sequencer_select.c @@ -1151,7 +1151,7 @@ static bool select_grouped_effect_link(Editing *ed, Sequence *actseq, const int } SEQ_END; - actseq->tmp = SET_INT_IN_POINTER(true); + actseq->tmp = POINTER_FROM_INT(true); for (BKE_sequence_iterator_begin(ed, &iter, true); iter.valid; BKE_sequence_iterator_next(&iter)) { seq = iter.seq; @@ -1176,7 +1176,7 @@ static bool select_grouped_effect_link(Editing *ed, Sequence *actseq, const int if (enddisp < seq->enddisp) enddisp = seq->enddisp; if (machine < seq->machine) machine = seq->machine; - seq->tmp = SET_INT_IN_POINTER(true); + seq->tmp = POINTER_FROM_INT(true); seq->flag |= SELECT; changed = true; |