bug fix 1698

- border render + backbuf crashed (!)
- escape from border render didn't put half-rendered result in final pic

2 files changed, 4 insertions, 9 deletions

diff --git a/source/blender/render/intern/source/initrender.c b/source/blender/render/intern/source/initrender.c
index 59de1a683c5..c50d580c881 100644
--- a/source/blender/render/intern/source/initrender.c
+++ b/source/blender/render/intern/source/initrender.c
@@ -765,12 +765,7 @@ void render() {
 	if (R.r.renderer==R_YAFRAY)
 		yafrayRender();
 	else {
-		/* not too neat... should improve... */
-		//if(R.r.mode & R_UNIFIED) {
-		//	unifiedRenderingLoop();
-		//} else {
-			oldRenderLoop();
-		//}
+		oldRenderLoop();
 	}
 }
 
@@ -875,8 +870,6 @@ void oldRenderLoop(void)  /* here the PART and FIELD loops */
 					else zbufshade();
 				}
 				
-				if(RE_local_test_break()) break;
-
 				/* exception */
 				if( (R.r.mode & R_BORDER) && (R.r.mode & R_MOVIECROP));
 				else {
@@ -894,6 +887,8 @@ void oldRenderLoop(void)  /* here the PART and FIELD loops */
 						}
 					}
 				}
+
+				if(RE_local_test_break()) break;
 			}
 
 			/* JOIN PARTS OR INSERT BORDER */
diff --git a/source/blender/render/intern/source/rendercore.c b/source/blender/render/intern/source/rendercore.c
index 97576ce7e84..0b545ed73a0 100644
--- a/source/blender/render/intern/source/rendercore.c
+++ b/source/blender/render/intern/source/rendercore.c
@@ -296,7 +296,7 @@ void scanlinesky(char *rect, int y)
 				}
 			}
 			/* which scanline/ */
-			dy= ((y+R.afmy+R.ystart)*R.backbuf->ibuf->y)/(2*R.afmy);
+			dy= ((y+R.afmy+R.ystart)*R.backbuf->ibuf->y)/(2*R.afmy);  // this division enables border/part render too
 			
 			if(R.flag & R_SEC_FIELD) {
 				if((R.r.mode & R_ODDFIELD)==0) {