kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix: VSE text strip size was wrong when preview render size != 100%

Browse Source 
Reviewed by: sergei
This commit is contained in:
Sybren A. Stüvel 2015-09-09 14:36:12 +02:00
parent 145617c5eb
commit a9b9478247
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/blenkernel/intern/seqeffects.c
View File

@ -43,6 +43,7 @@
#include "DNA_scene_types.h"
#include "DNA_sequence_types.h"
#include "DNA_anim_types.h"
#include "DNA_space_types.h"
#include "BKE_fcurve.h"
#include "BKE_sequencer.h"
@ -2920,12 +2921,21 @@ static ImBuf *do_text_effect(const SeqRenderData *context, Sequence *seq, float
const char *display_device;
const int mono = blf_mono_font_render; // XXX
int y_ofs, x, y;
float proxy_size_comp;
display_device = context->scene->display_settings.display_device;
display = IMB_colormanagement_display_get_named(display_device);
/* Compensate text size for preview render size. */
if (context->preview_render_size == SEQ_PROXY_RENDER_SIZE_100) {
/* Should be rendered at 100%, but context->preview_render_size = 99 right now. */
proxy_size_comp = 1.0f;
} else {
proxy_size_comp = context->preview_render_size / 100.0f;
}
/* set before return */
BLF_size(mono, (context->scene->r.size / 100.0f) * data->text_size, 72);
BLF_size(mono, proxy_size_comp * (context->scene->r.size / 100) * data->text_size, 72);
BLF_buffer(mono, out->rect_float, (unsigned char *)out->rect, width, height, out->channels, display);