[Bf-blender-cvs] [32301a07000] master: Fix sequencer text leaving bold & italic flags enabled

[Campbell Barton]

Commit: 32301a070006a07abe76394a8a5d24337a30f74b
Author: Campbell Barton
Date:   Tue Mar 23 16:03:28 2021 +1100
Branches: master
https://developer.blender.org/rB32301a070006a07abe76394a8a5d24337a30f74b

Fix sequencer text leaving bold & italic flags enabled

Regression in 913b71bb8be9b40da9c0f0cd21016c784a56dc18

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

M       source/blender/sequencer/intern/effects.c

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

diff --git a/source/blender/sequencer/intern/effects.c 
b/source/blender/sequencer/intern/effects.c
index 87412d61f0e..278320d873e 100644
--- a/source/blender/sequencer/intern/effects.c
+++ b/source/blender/sequencer/intern/effects.c
@@ -3945,18 +3945,13 @@ static ImBuf *do_text_effect(const SeqRenderData 
*context,
     proxy_size_comp = 
SEQ_rendersize_to_scale_factor(context->preview_render_size);
   }
 
-  BLF_disable(font, BLF_ITALIC | BLF_BOLD);
-  if (data->flag & SEQ_TEXT_BOLD) {
-    BLF_enable(font, BLF_BOLD);
-  }
-  if (data->flag & SEQ_TEXT_ITALIC) {
-    BLF_enable(font, BLF_ITALIC);
-  }
-
   /* set before return */
   BLF_size(font, proxy_size_comp * data->text_size, 72);
 
-  BLF_enable(font, BLF_WORD_WRAP);
+  const int font_flags = BLF_WORD_WRAP | /* Always allow wrapping. */
+                         ((data->flag & SEQ_TEXT_BOLD) ? BLF_BOLD : 0) |
+                         ((data->flag & SEQ_TEXT_ITALIC) ? BLF_ITALIC : 0);
+  BLF_enable(font, font_flags);
 
   /* use max width to enable newlines only */
   BLF_wordwrap(font, (data->wrap_width != 0.0f) ? data->wrap_width * width : 
-1);
@@ -4027,7 +4022,7 @@ static ImBuf *do_text_effect(const SeqRenderData *context,
 
   BLF_buffer(font, NULL, NULL, 0, 0, 0, NULL);
 
-  BLF_disable(font, BLF_WORD_WRAP);
+  BLF_disable(font, font_flags);
 
   return out;
 }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs