[Bf-blender-cvs] [440c91b1f64] master: Fix T52011: Border render is incorrect with multiple scenes

[Sergey Sharybin]

Commit: 440c91b1f6404082011d9e5d5a1c755d0b75ca9d
Author: Sergey Sharybin
Date:   Mon Jul 10 12:17:13 2017 +0200
Branches: master
https://developer.blender.org/rB440c91b1f6404082011d9e5d5a1c755d0b75ca9d

Fix T52011: Border render is incorrect with multiple scenes

The code was somewhat weird: it was first copying border/crop settings from
the "source" scene, then was checking border settings of the current scene
and only then was copying border from "source" scene.

Now we first copy border/crop flags, then copy border from source and then
check whether border is a full-frame.

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

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 929eae495cf..e078365e1ed 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -723,6 +723,8 @@ void RE_InitState(Render *re, Render *source, RenderData *rd,
 		re->r.size = source->r.size;
 	}
 
+	re_init_resolution(re, source, winx, winy, disprect);
+
 	/* disable border if it's a full render anyway */
 	if (re->r.border.xmin == 0.0f && re->r.border.xmax == 1.0f &&
 	    re->r.border.ymin == 0.0f && re->r.border.ymax == 1.0f)
@@ -730,8 +732,6 @@ void RE_InitState(Render *re, Render *source, RenderData *rd,
 		re->r.mode &= ~R_BORDER;
 	}
 
-	re_init_resolution(re, source, winx, winy, disprect);
-
 	if (re->rectx < 1 || re->recty < 1 || (BKE_imtype_is_movie(rd->im_format.imtype) &&
 	                                       (re->rectx < 16 || re->recty < 16) ))
 	{