Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2020-04-15 07:20:14 +0300
committerCampbell Barton <ideasman42@gmail.com>2020-04-15 07:20:14 +0300
commit0d4eefd23113d4d2740e032e27ad47015ad687d0 (patch)
tree0eb6b00c4790e190ba3d49c76409c1e53a65bd4d /source/blender/blenkernel/intern/seqeffects.c
parent1bb241437cf5ce16cbc83e228a0cde71ee7b37b1 (diff)
Fix T75712: Sequencer text strip doesn't scale to render size
Diffstat (limited to 'source/blender/blenkernel/intern/seqeffects.c')
-rw-r--r--source/blender/blenkernel/intern/seqeffects.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/seqeffects.c b/source/blender/blenkernel/intern/seqeffects.c
index 6acc50f30e9..c1644e39afa 100644
--- a/source/blender/blenkernel/intern/seqeffects.c
+++ b/source/blender/blenkernel/intern/seqeffects.c
@@ -3881,11 +3881,9 @@ static ImBuf *do_text_effect(const SeqRenderData *context,
display = IMB_colormanagement_display_get_named(display_device);
/* Compensate text size for preview render size. */
- if (context->preview_render_size == SEQ_PROXY_RENDER_SIZE_SCENE) {
- proxy_size_comp = context->scene->r.size / 100.0;
- }
- else {
- proxy_size_comp = BKE_sequencer_rendersize_to_scale_factor(context->preview_render_size);
+ proxy_size_comp = context->scene->r.size / 100.0;
+ if (context->preview_render_size != SEQ_PROXY_RENDER_SIZE_SCENE) {
+ proxy_size_comp *= BKE_sequencer_rendersize_to_scale_factor(context->preview_render_size);
}
/* set before return */