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
path: root/source
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2013-12-29 15:25:56 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2013-12-29 15:25:56 +0400
commit873c6e547973490b49af837b2fe61e04783034f8 (patch)
tree448294256540e1dff166a1485639238ee0da3389 /source
parent3b08ee89965230063a95c74d656d88178622b996 (diff)
Fix movie output when using render border
Reported by @plasmasolutions in IRC.
Diffstat (limited to 'source')
-rw-r--r--source/blender/render/intern/source/pipeline.c21
1 files changed, 19 insertions, 2 deletions
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index 4ec7ce1c0d2..db12dd1d703 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)) {