[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12073] branches/cloth/blender/source/ blender/src/editview.c: bf-blender/trunk/ blender rev 12059 + 12060 + 12064 merged (this commit is only 12059, others are already merged)

[Daniel Genrich]

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

Log Message:
-----------
bf-blender/trunk/blender rev 12059 + 12060 + 12064 merged (this commit is only 12059, others are already merged)

Revision Links:
--------------
    http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12059

Modified Paths:
--------------
    branches/cloth/blender/source/blender/src/editview.c

Modified: branches/cloth/blender/source/blender/src/editview.c
===================================================================
--- branches/cloth/blender/source/blender/src/editview.c	2007-09-17 19:32:15 UTC (rev 12072)
+++ branches/cloth/blender/source/blender/src/editview.c	2007-09-17 19:57:47 UTC (rev 12073)
@@ -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);
 	}
 }