[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58921] trunk/blender/source/blender/ editors/screen/area.c: revert r58920 change to area.c, committed by accident

Campbell Barton ideasman42 at gmail.com
Mon Aug 5 06:38:55 CEST 2013


Revision: 58921
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58921
Author:   campbellbarton
Date:     2013-08-05 04:38:54 +0000 (Mon, 05 Aug 2013)
Log Message:
-----------
revert r58920 change to area.c, committed by accident

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58920

Modified Paths:
--------------
    trunk/blender/source/blender/editors/screen/area.c

Modified: trunk/blender/source/blender/editors/screen/area.c
===================================================================
--- trunk/blender/source/blender/editors/screen/area.c	2013-08-05 04:35:28 UTC (rev 58920)
+++ trunk/blender/source/blender/editors/screen/area.c	2013-08-05 04:38:54 UTC (rev 58921)
@@ -401,29 +401,21 @@
 	wmWindow *win = CTX_wm_window(C);
 	ScrArea *sa = CTX_wm_area(C);
 	ARegionType *at = ar->type;
-	rcti srct;
 	
 	/* see BKE_spacedata_draw_locks() */
 	if (at->do_lock)
 		return;
 	
 	/* if no partial draw rect set, full rect */
-	if (ar->drawrct.xmin == ar->drawrct.xmax) {
+	if (ar->drawrct.xmin == ar->drawrct.xmax)
 		ar->drawrct = ar->winrct;
-		srct = ar->drawrct;
-	}
 	else {
 		/* extra clip for safety */
 		BLI_rcti_isect(&ar->winrct, &ar->drawrct, &ar->drawrct);
-		srct = ar->drawrct;
-
-		/* compensate for wmSubWindowScissorSet which adds one */
-		srct.xmax -= 1;
-		srct.ymax -= 1;
 	}
 	
 	/* note; this sets state, so we can use wmOrtho and friends */
-	wmSubWindowScissorSet(win, ar->swinid, &srct);
+	wmSubWindowScissorSet(win, ar->swinid, &ar->drawrct);
 	
 	UI_SetTheme(sa ? sa->spacetype : 0, at->regionid);
 	




More information about the Bf-blender-cvs mailing list