[Bf-blender-cvs] [3059c0b386d] master: Fix T85970: Incorrect scaling of meta strips

Richard Antalik noreply at git.blender.org
Tue Mar 2 12:23:19 CET 2021


Commit: 3059c0b386d3eedbbaaecb4489ff70d61348e2bf
Author: Richard Antalik
Date:   Tue Mar 2 12:20:16 2021 +0100
Branches: master
https://developer.blender.org/rB3059c0b386d3eedbbaaecb4489ff70d61348e2bf

Fix T85970: Incorrect scaling of meta strips

This is same issue as fixed by d85789255320, but I forgot to check meta
strips. Meta strip output is always in render size.

Reviewed By: sergey

Differential Revision: https://developer.blender.org/D10560

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

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

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

diff --git a/source/blender/sequencer/intern/render.c b/source/blender/sequencer/intern/render.c
index f1a0a7db13b..cf07fc7bc19 100644
--- a/source/blender/sequencer/intern/render.c
+++ b/source/blender/sequencer/intern/render.c
@@ -583,6 +583,7 @@ static bool seq_need_scale_to_render_size(const Sequence *seq, bool is_proxy_ima
     return true;
   }
   if ((seq->type & SEQ_TYPE_EFFECT) != 0 || seq->type == SEQ_TYPE_MASK ||
+      seq->type == SEQ_TYPE_META ||
       (seq->type == SEQ_TYPE_SCENE && ((seq->flag & SEQ_SCENE_STRIPS) != 0))) {
     return true;
   }



More information about the Bf-blender-cvs mailing list