[Bf-blender-cvs] [0d4eefd2311] master: Fix T75712: Sequencer text strip doesn't scale to render size

Campbell Barton noreply at git.blender.org
Wed Apr 15 06:22:27 CEST 2020


Commit: 0d4eefd23113d4d2740e032e27ad47015ad687d0
Author: Campbell Barton
Date:   Wed Apr 15 14:20:14 2020 +1000
Branches: master
https://developer.blender.org/rB0d4eefd23113d4d2740e032e27ad47015ad687d0

Fix T75712: Sequencer text strip doesn't scale to render size

===================================================================

M	source/blender/blenkernel/intern/seqeffects.c

===================================================================

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 */



More information about the Bf-blender-cvs mailing list