diff options
| author | Ton Roosendaal <ton@blender.org> | 2004-12-12 21:16:35 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2004-12-12 21:16:35 +0300 |
| commit | f48b4f5b4a4380abacf890ff68c7d6e5b51b57a4 (patch) | |
| tree | 331b7a04a68491f85729331aec04743e5440ba47 | |
| parent | c021f107834ec4759c8da5371f8a0ce4cec98da7 (diff) | |
Bugfix #2008
Combination of:
- render movie
- with border set
- and "crop" set
Crashed.
Was due to feeding movie initialize code wrong frame sizes. Another oldie!
Also found that crop+border+parts doesnt work. This now is prevented with
warning and return.
| -rw-r--r-- | source/blender/render/intern/source/initrender.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/source/blender/render/intern/source/initrender.c b/source/blender/render/intern/source/initrender.c index 1a3b4a82122..be1f659d7e6 100644 --- a/source/blender/render/intern/source/initrender.c +++ b/source/blender/render/intern/source/initrender.c @@ -1112,20 +1112,25 @@ void RE_initrender(struct View3D *ogl_render_view3d) /* forbidden combination */ if((R.r.mode & R_BORDER) && (R.r.mode & R_PANORAMA)) { - error("No border allowed for Panorama"); + error("No border supported for Panorama"); G.afbreek= 1; return; } + if(R.r.xparts*R.r.yparts>=2 && (R.r.mode & R_MOVIECROP) && (R.r.mode & R_BORDER)) { + error("Combination of border, crop and parts not allowed"); + G.afbreek= 1; + return; + } if(R.r.xparts*R.r.yparts>64) { - error("No more than 64 parts"); + error("No more than 64 parts supported"); G.afbreek= 1; return; } if(R.r.yparts>1 && (R.r.mode & R_PANORAMA)) { - error("No Y-Parts allowed for Panorama"); + error("No Y-Parts supported for Panorama"); G.afbreek= 1; return; } @@ -1288,6 +1293,10 @@ void RE_animrender(struct View3D *ogl_render_view3d) R.rectx*= R.r.xparts; R.recty*= R.r.yparts; } + if(R.r.mode & R_MOVIECROP) { + initparts(); + setpart(0); // this will adjust r.rectx + } if (0) { #ifdef __sgi |