Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2014-04-24 12:28:18 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2014-04-24 12:30:22 +0400
commite7c5931990fe3ae4016352bbc2ea3d9a0186ab6d (patch)
tree38edb833ba02f1797c64bf7654940a8e16c1d508 /source/blender/blenkernel/intern/sequencer.c
parentf5a716b5e05375b9faef23553b66157dfe9f95f0 (diff)
Fix T39785: Video Sequencer, Aspect Ratio issue
Sequencer preview was rendering all scenes with the context resolution, which doesn't give proper result. Now made it so sequencer scene preview uses scene's resolution.
Diffstat (limited to 'source/blender/blenkernel/intern/sequencer.c')
-rw-r--r--source/blender/blenkernel/intern/sequencer.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c
index 3e5b277f865..d3b6e810b55 100644
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -2553,6 +2553,9 @@ static ImBuf *seq_render_scene_strip(const SeqRenderData *context, Sequence *seq
if ((sequencer_view3d_cb && do_seq_gl && camera) && is_thread_main) {
char err_out[256] = "unknown";
+ int width = (scene->r.xsch * scene->r.size) / 100;
+ int height = (scene->r.ysch * scene->r.size) / 100;
+
/* for old scened this can be uninitialized,
* should probably be added to do_versions at some point if the functionality stays */
if (context->scene->r.seq_prev_type == 0)
@@ -2560,7 +2563,7 @@ static ImBuf *seq_render_scene_strip(const SeqRenderData *context, Sequence *seq
/* opengl offscreen render */
BKE_scene_update_for_newframe(context->eval_ctx, context->bmain, scene, scene->lay);
- ibuf = sequencer_view3d_cb(scene, camera, context->rectx, context->recty, IB_rect,
+ ibuf = sequencer_view3d_cb(scene, camera, width, height, IB_rect,
context->scene->r.seq_prev_type,
(context->scene->r.seq_flag & R_SEQ_SOLID_TEX) != 0,
true, scene->r.alphamode, err_out);