[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20345] branches/blender2.5/blender/source /blender/editors/screen/area.c: 2.5
Ton Roosendaal
ton at blender.org
Fri May 22 17:56:35 CEST 2009
Revision: 20345
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20345
Author: ton
Date: 2009-05-22 17:56:33 +0200 (Fri, 22 May 2009)
Log Message:
-----------
2.5
Forgot in last commit; clamping the area dividing distance to sane
values. Monkey proofing :)
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/editors/screen/area.c
Modified: branches/blender2.5/blender/source/blender/editors/screen/area.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/screen/area.c 2009-05-22 15:51:35 UTC (rev 20344)
+++ branches/blender2.5/blender/source/blender/editors/screen/area.c 2009-05-22 15:56:33 UTC (rev 20345)
@@ -545,15 +545,16 @@
static void area_calc_totrct(ScrArea *sa, int sizex, int sizey)
{
-
- if(sa->v1->vec.x>0) sa->totrct.xmin= sa->v1->vec.x+1+G.rt;
+ short rt= CLAMPIS(G.rt, 0, 16);
+
+ if(sa->v1->vec.x>0) sa->totrct.xmin= sa->v1->vec.x+1+rt;
else sa->totrct.xmin= sa->v1->vec.x;
- if(sa->v4->vec.x<sizex-1) sa->totrct.xmax= sa->v4->vec.x-1-G.rt;
+ if(sa->v4->vec.x<sizex-1) sa->totrct.xmax= sa->v4->vec.x-1-rt;
else sa->totrct.xmax= sa->v4->vec.x;
- if(sa->v1->vec.y>0) sa->totrct.ymin= sa->v1->vec.y+1+G.rt;
+ if(sa->v1->vec.y>0) sa->totrct.ymin= sa->v1->vec.y+1+rt;
else sa->totrct.ymin= sa->v1->vec.y;
- if(sa->v2->vec.y<sizey-1) sa->totrct.ymax= sa->v2->vec.y-1-G.rt;
+ if(sa->v2->vec.y<sizey-1) sa->totrct.ymax= sa->v2->vec.y-1-rt;
else sa->totrct.ymax= sa->v2->vec.y;
/* for speedup */
More information about the Bf-blender-cvs
mailing list