[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12059] trunk/blender/source/blender/src/ editview.c: * Tiny tweak to 'set border render (shift B)'.

[Matt Ebb]

Revision: 12059
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12059
Author:   broken
Date:     2007-09-17 13:07:21 +0200 (Mon, 17 Sep 2007)

Log Message:
-----------
* Tiny tweak to 'set border render (shift B)'. It was always 
annoying to have no hotkey to disable render border, having to 
switch to render buttons to disable it even though you used a 
hotkey shift B to enable it.

This change makes it so that if you drag the border to cover the 
entire camera view, it will automatically disable border rendering.

Modified Paths:
--------------
    trunk/blender/source/blender/src/editview.c

Modified: trunk/blender/source/blender/src/editview.c
===================================================================
--- trunk/blender/source/blender/src/editview.c	2007-09-17 10:41:20 UTC (rev 12058)
+++ trunk/blender/source/blender/src/editview.c	2007-09-17 11:07:21 UTC (rev 12059)
@@ -2063,15 +2063,23 @@
 		G.scene->r.border.ymin= ((float)rect.ymin-vb.ymin)/(vb.ymax-vb.ymin);
 		G.scene->r.border.xmax= ((float)rect.xmax-vb.xmin)/(vb.xmax-vb.xmin);
 		G.scene->r.border.ymax= ((float)rect.ymax-vb.ymin)/(vb.ymax-vb.ymin);
-		
+				
 		CLAMP(G.scene->r.border.xmin, 0.0, 1.0);
 		CLAMP(G.scene->r.border.ymin, 0.0, 1.0);
 		CLAMP(G.scene->r.border.xmax, 0.0, 1.0);
 		CLAMP(G.scene->r.border.ymax, 0.0, 1.0);
+	
+		allqueue(REDRAWVIEWCAM, 1);
 		
-		allqueue(REDRAWVIEWCAM, 1);
-		/* if it was not set, we do this */
-		G.scene->r.mode |= R_BORDER;
+		/* drawing a border surrounding the entire camera view switches off border rendering */
+		if (G.scene->r.border.xmin <= 0.0 && G.scene->r.border.xmax >= 1.0 &&
+			G.scene->r.border.ymin <= 0.0 && G.scene->r.border.ymax >= 1.0)
+		{
+			G.scene->r.mode &= ~R_BORDER;
+		} else {
+			G.scene->r.mode |= R_BORDER;
+		}
+		
 		allqueue(REDRAWBUTSSCENE, 1);
 	}
 }