diff options
author | Richard Antalik <richardantalik@gmail.com> | 2019-02-23 22:33:48 +0300 |
---|---|---|
committer | Richard Antalik <richardantalik@gmail.com> | 2019-02-23 22:33:48 +0300 |
commit | 82b3b1a3c616abb9c56d1e59366ea2a35fd1b7f6 (patch) | |
tree | e31f39512cf8aecf51e9f2af62bdca5cf2a5bb14 /source/blender/blenkernel | |
parent | 5cc0bfa73a7257f3fa44d6894522aad3d81cdeb2 (diff) |
Revert "Glyph cache is cleared by UI_view2d_zoom_cache_reset, when zooming V2D, but is required to calculate text height in UI_view2d_text_cache_draw"
Accidentaly committed unwanted changes.
This reverts commit 6bcdcc96c2548e0ee5e18acc37915aedee6329e0.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_sequencer.h | 1 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/sequencer.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/blenkernel/BKE_sequencer.h b/source/blender/blenkernel/BKE_sequencer.h index 8df2c67ecda..72cdaf97ec3 100644 --- a/source/blender/blenkernel/BKE_sequencer.h +++ b/source/blender/blenkernel/BKE_sequencer.h @@ -240,7 +240,6 @@ int BKE_sequencer_evaluate_frame(struct Scene *scene, int cfra); struct StripElem *BKE_sequencer_give_stripelem(struct Sequence *seq, int cfra); /* intern */ -double seq_rendersize_to_scale_factor(int size); void BKE_sequencer_update_changed_seq_and_deps(struct Scene *scene, struct Sequence *changed_seq, int len_change, int ibuf_change); bool BKE_sequencer_input_have_to_preprocess(const SeqRenderData *context, struct Sequence *seq, float cfra); diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index cb53e527c11..56e34bbeb11 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -1471,7 +1471,7 @@ static IMB_Proxy_Size seq_rendersize_to_proxysize(int size) return IMB_PROXY_25; } -double seq_rendersize_to_scale_factor(int size) +static double seq_rendersize_to_scale_factor(int size) { if (size >= 99) { return 1.0; |