diff options
| author | Richard Antalik <richardantalik@gmail.com> | 2020-01-22 02:27:02 +0300 |
|---|---|---|
| committer | Richard Antalik <richardantalik@gmail.com> | 2020-01-22 02:59:31 +0300 |
| commit | 3119a014a6e126102c67b014a55dd455dc9557e2 (patch) | |
| tree | 41646ccb62bf1c7bd8fba6068e3a373e9fc527dd /source/blender/blenkernel/intern/seqeffects.c | |
| parent | bda0c0847b5ef89b31d56b0d88705bafaef90616 (diff) | |
Fix T70415 100% proxy files playing with poor performance
Refactor code to use `eSpaceSeq_Proxy_RenderSize` or corresponding `IMB_Proxy_Size`
enum items directly.
`SEQ_PROXY_RENDER_SIZE_100` has assigned value 99 to distinguish from `SEQ_PROXY_RENDER_SIZE_FULL`.
This caused error in image size calculation and because of that image had to be scaled.
Author: EitanSomething
Reviewed By: ISS
Differential Revision: http://developer.blender.org/D6368
Diffstat (limited to 'source/blender/blenkernel/intern/seqeffects.c')
| -rw-r--r-- | source/blender/blenkernel/intern/seqeffects.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/source/blender/blenkernel/intern/seqeffects.c b/source/blender/blenkernel/intern/seqeffects.c index 236fb43e89c..8dfe01ae1fd 100644 --- a/source/blender/blenkernel/intern/seqeffects.c +++ b/source/blender/blenkernel/intern/seqeffects.c @@ -3888,7 +3888,7 @@ static ImBuf *do_text_effect(const SeqRenderData *context, int font = blf_mono_font_render; int line_height; int y_ofs, x, y; - float proxy_size_comp; + double proxy_size_comp; if (data->text_blf_id == SEQ_FONT_NOT_LOADED) { data->text_blf_id = -1; @@ -3906,15 +3906,11 @@ static ImBuf *do_text_effect(const SeqRenderData *context, display = IMB_colormanagement_display_get_named(display_device); /* Compensate text size for preview render size. */ - if (ELEM( - context->preview_render_size, SEQ_PROXY_RENDER_SIZE_SCENE, SEQ_PROXY_RENDER_SIZE_FULL)) { - proxy_size_comp = context->scene->r.size / 100.0f; - } - else if (context->preview_render_size == SEQ_PROXY_RENDER_SIZE_100) { - proxy_size_comp = 1.0f; + if (context->preview_render_size == SEQ_PROXY_RENDER_SIZE_SCENE) { + proxy_size_comp = context->scene->r.size / 100.0; } else { - proxy_size_comp = context->preview_render_size / 100.0f; + proxy_size_comp = BKE_sequencer_rendersize_to_scale_factor(context->preview_render_size); } /* set before return */ |