diff options
| author | Peter Schlaile <peter@schlaile.de> | 2010-11-01 21:55:12 +0300 |
|---|---|---|
| committer | Peter Schlaile <peter@schlaile.de> | 2010-11-01 21:55:12 +0300 |
| commit | f890b00851317a9acd8e4f784b99bf2986c8b872 (patch) | |
| tree | 50a6e720b6a39c5d7982599a61141c9ea0eb3d74 /source/blender/blenkernel/intern/seqeffects.c | |
| parent | 1b18ea58239b39538f1947cbc1ee0fba9cd26dd9 (diff) | |
Sequencer: fix for the fix of: #23318
also known as: broken multicam strip caused by other fix.
Calculated render_size where it belongs (within the glow effect) and
restored old functionality.
also: renamed render_size to preview_render_size at all relevant places,
where the naming wasn't used correctly.
Hopefully it's now a little bit more clear.
render_size := render size from scene (just rescales width/height)
preview_render_size := preview render size from sequencer preview,
controls the resolution and the use of sequencer proxy sources
Diffstat (limited to 'source/blender/blenkernel/intern/seqeffects.c')
| -rw-r--r-- | source/blender/blenkernel/intern/seqeffects.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/seqeffects.c b/source/blender/blenkernel/intern/seqeffects.c index b8307a9fb04..f5dc04ca569 100644 --- a/source/blender/blenkernel/intern/seqeffects.c +++ b/source/blender/blenkernel/intern/seqeffects.c @@ -2660,14 +2660,16 @@ static void do_glow_effect_float(Sequence *seq, int render_size, float facf0, fl } static struct ImBuf * do_glow_effect( - Main *UNUSED(bmain), Scene *UNUSED(scene), Sequence *seq, float UNUSED(cfra), + Main *UNUSED(bmain), Scene * scene, Sequence *seq, float UNUSED(cfra), float facf0, float facf1, int x, int y, - int render_size, + int UNUSED(preview_render_size), struct ImBuf *ibuf1, struct ImBuf *ibuf2, struct ImBuf *ibuf3) { struct ImBuf * out = prepare_effect_imbufs(x, y, ibuf1, ibuf2, ibuf3); + int render_size = 100*x/scene->r.xsch; + if (out->rect_float) { do_glow_effect_float(seq, render_size, facf0, facf1, x, y, |