[Bf-blender-cvs] [0d7036b40e6] master: Fix T80424: Image not scaled when rendering

Richard Antalik noreply at git.blender.org
Thu Sep 24 16:21:46 CEST 2020


Commit: 0d7036b40e68496fe36d7cbc8113b63574dd9d57
Author: Richard Antalik
Date:   Thu Sep 24 16:14:49 2020 +0200
Branches: master
https://developer.blender.org/rB0d7036b40e68496fe36d7cbc8113b63574dd9d57

Fix T80424: Image not scaled when rendering

This is was caused by incorrectly set `preview_render_size` in VSE
rendering context. Value was set to `SEQ_PROXY_RENDER_SIZE_FULL`, but
it should be `SEQ_PROXY_RENDER_SIZE_SCENE` as scene render size is
being used.

Alternatively we can check for `context->for_render` in
`input_preprocess()`, but I think fix above is more correct.

Reviewed By: sergey, brecht

Maniphest Tasks: T80424

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

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

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

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

diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index 2d581a4765e..8b40c96e8d7 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -36,6 +36,7 @@
 #include "DNA_particle_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_sequence_types.h"
+#include "DNA_space_types.h"
 #include "DNA_userdef_types.h"
 
 #include "MEM_guardedalloc.h"
@@ -1502,8 +1503,14 @@ static void do_render_seq(Render *re)
   tot_views = BKE_scene_multiview_num_views_get(&re->r);
   ibuf_arr = MEM_mallocN(sizeof(ImBuf *) * tot_views, "Sequencer Views ImBufs");
 
-  BKE_sequencer_new_render_data(
-      re->main, re->pipeline_depsgraph, re->scene, re_x, re_y, 100, true, &context);
+  BKE_sequencer_new_render_data(re->main,
+                                re->pipeline_depsgraph,
+                                re->scene,
+                                re_x,
+                                re_y,
+                                SEQ_PROXY_RENDER_SIZE_SCENE,
+                                true,
+                                &context);
 
   /* the renderresult gets destroyed during the rendering, so we first collect all ibufs
    * and then we populate the final renderesult */



More information about the Bf-blender-cvs mailing list