[Bf-blender-cvs] [873c6e5] master: Fix movie output when using render border

[Sergey Sharybin]

Commit: 873c6e547973490b49af837b2fe61e04783034f8
Author: Sergey Sharybin
Date:   Sun Dec 29 17:25:56 2013 +0600
https://developer.blender.org/rB873c6e547973490b49af837b2fe61e04783034f8

Fix movie output when using render border

Reported by @plasmasolutions in IRC.

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

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 4ec7ce1..db12dd1 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -2756,9 +2756,26 @@ void RE_BlenderAnim(Render *re, Main *bmain, Scene *scene, Object *camera_overri
 
 	re->flag |= R_ANIMATION;
 
-	if (BKE_imtype_is_movie(scene->r.im_format.imtype))
-		if (!mh->start_movie(scene, &re->r, re->rectx, re->recty, re->reports))
+	if (BKE_imtype_is_movie(scene->r.im_format.imtype)) {
+		int width, height;
+		if (re->r.mode & R_BORDER) {
+			if ((re->r.mode & R_CROP) == 0) {
+				width = re->winx;
+				height = re->winy;
+			}
+			else {
+				width = re->rectx;
+				height = re->recty;
+			}
+		}
+		else {
+			width = re->rectx;
+			height = re->recty;
+		}
+
+		if (!mh->start_movie(scene, &re->r, width, height, re->reports))
 			G.is_break = TRUE;
+	}
 
 	if (mh->get_next_frame) {
 		while (!(G.is_break == 1)) {