blender
/
blender
136
406
Fork 588
Code Issues 6.2k Pull Requests 752 Projects 19 Wiki Activity

Fix sequencer text leaving bold & italic flags enabled 

Regression in 913b71bb8b
This commit is contained in:
Campbell Barton 2021-03-23 16:03:28 +11:00
parent ee07bfa3a0
commit 32301a0700
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
source/blender/sequencer/intern/effects.c
View File

@ -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;
}