diff options
| author | Richard Antalik <richardantalik@gmail.com> | 2020-11-17 06:10:51 +0300 |
|---|---|---|
| committer | Richard Antalik <richardantalik@gmail.com> | 2020-11-17 06:10:51 +0300 |
| commit | 797dfa6a0a7d5d2bf62bdc03cf619addbc9e1064 (patch) | |
| tree | 5a1e0f0a6b2439ceee4a8e0bae82b243e3831156 /source/blender/sequencer | |
| parent | 09045ff64d1f0948489354bd097f2930f45bacb9 (diff) | |
| parent | 75bd286813eb5e3c227696b4cfd5616b17166641 (diff) | |
Merge branch 'blender-v2.91-release'
Conflicts:
source/blender/editors/render/render_opengl.c
source/blender/sequencer/intern/effects.c
Diffstat (limited to 'source/blender/sequencer')
| -rw-r--r-- | source/blender/sequencer/intern/effects.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/sequencer/intern/effects.c b/source/blender/sequencer/intern/effects.c index 1d323426cc3..ba16206ce97 100644 --- a/source/blender/sequencer/intern/effects.c +++ b/source/blender/sequencer/intern/effects.c @@ -3915,7 +3915,7 @@ static ImBuf *do_text_effect(const SeqRenderData *context, /* Compensate text size for preview render size. */ proxy_size_comp = context->scene->r.size / 100.0; if (context->preview_render_size != SEQ_RENDER_SIZE_SCENE) { - proxy_size_comp *= SEQ_rendersize_to_scale_factor(context->preview_render_size); + proxy_size_comp = SEQ_rendersize_to_scale_factor(context->preview_render_size); } /* set before return */ |