diff options
Diffstat (limited to 'source/blender/editors/space_sequencer/sequencer_draw.c')
| -rw-r--r-- | source/blender/editors/space_sequencer/sequencer_draw.c | 30 |
1 files changed, 3 insertions, 27 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c index bef4a7cdd22..6ebccf31355 100644 --- a/source/blender/editors/space_sequencer/sequencer_draw.c +++ b/source/blender/editors/space_sequencer/sequencer_draw.c @@ -449,7 +449,7 @@ static void drawmeta_contents(Scene *scene, Sequence *seqm, float x1, float y1, } /* clamp handles to defined size in pixel space */ -static float draw_seq_handle_size_get_clamped(Sequence *seq, const float pixelx) +float sequence_handle_size_get_clamped(Sequence *seq, const float pixelx) { const float minhandle = pixelx * SEQ_HANDLE_SIZE_MIN; const float maxhandle = pixelx * SEQ_HANDLE_SIZE_MAX; @@ -806,7 +806,7 @@ static void draw_seq_strip(const bContext *C, View2D *v2d = &ar->v2d; float x1, x2, y1, y2; unsigned char col[4], background_col[4], is_single_image; - const float handsize_clamped = draw_seq_handle_size_get_clamped(seq, pixelx); + const float handsize_clamped = sequence_handle_size_get_clamped(seq, pixelx); /* we need to know if this is a single image/color or not for drawing */ is_single_image = (char)BKE_sequence_single_check(seq); @@ -1055,11 +1055,8 @@ ImBuf *sequencer_ibuf_get(struct Main *bmain, if (special_seq_update) { ibuf = BKE_sequencer_give_ibuf_direct(&context, cfra + frame_ofs, special_seq_update); } - else if (!U.prefetchframes) { // XXX || (G.f & G_PLAYANIM) == 0) { - ibuf = BKE_sequencer_give_ibuf(&context, cfra + frame_ofs, sseq->chanshown); - } else { - ibuf = BKE_sequencer_give_ibuf_threaded(&context, cfra + frame_ofs, sseq->chanshown); + ibuf = BKE_sequencer_give_ibuf(&context, cfra + frame_ofs, sseq->chanshown); } if (fb) { @@ -1622,27 +1619,6 @@ void sequencer_draw_preview(const bContext *C, seq_prefetch_wm_notify(C, scene); } -#if 0 -void drawprefetchseqspace(Scene *scene, ARegion *UNUSED(ar), SpaceSeq *sseq) -{ - int rectx, recty; - int render_size = BKE_sequencer_rendersize_to_scale_factor(sseq->render_size); - if (sseq->render_size == SEQ_PROXY_RENDER_SIZE_NONE) { - return; - } - - if (sseq->render_size == SEQ_PROXY_RENDER_SIZE_SCENE) { - render_size = scene->r.size / 100.0; - } - rectx = render_size * scene->r.xsch + 0.5; - recty = render_size * scene->r.ysch + 0.5; - - if (sseq->mainb != SEQ_DRAW_SEQUENCE) { - give_ibuf_prefetch_request(rectx, recty, (scene->r.cfra), sseq->chanshown, sseq->render_size); - } -} -#endif - /* draw backdrop of the sequencer strips view */ static void draw_seq_backdrop(View2D *v2d) { |