diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2007-12-02 02:25:00 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2007-12-02 02:25:00 +0300 |
| commit | 1e32ec2000ef2e50a93d2934f4692c7a88e59ac5 (patch) | |
| tree | 5bae16c23664f4e789879f43b63801599f2695e2 /source/blender/blenkernel | |
| parent | 141e279d708c80b5187898035d0d50181cbb6dca (diff) | |
minor update, "Draw Handles" wasnt working when disabled everywhere and replaced some magic numbers
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/intern/curve.c | 14 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/ipo.c | 8 |
2 files changed, 11 insertions, 11 deletions
diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c index 6676bf0e03f..fcf44fb0775 100644 --- a/source/blender/blenkernel/intern/curve.c +++ b/source/blender/blenkernel/intern/curve.c @@ -1539,8 +1539,8 @@ void makeBevelList(Object *ob) bevp->y= prevbezt->vec[1][1]; bevp->z= prevbezt->vec[1][2]; bevp->alfa= prevbezt->alfa; - bevp->f1= 1; - bevp->f2= 0; + bevp->f1= SELECT; + bevp->f2= SELECT; bevp++; bl->nr++; bl->flag= 1; @@ -1645,7 +1645,7 @@ void makeBevelList(Object *ob) if( fabs(bevp0->x-bevp1->x)<0.00001 ) { if( fabs(bevp0->y-bevp1->y)<0.00001 ) { if( fabs(bevp0->z-bevp1->z)<0.00001 ) { - bevp0->f2= 1; + bevp0->f2= SELECT; bl->flag++; } } @@ -2162,7 +2162,7 @@ void calchandleNurb(BezTriple *bezt, BezTriple *prev, BezTriple *next, int mode) if(len1==0.0) len1=1.0; if(len2==0.0) len2=1.0; - if(bezt->f1 & 1) { /* order of calculation */ + if(bezt->f1 & SELECT) { /* order of calculation */ if(bezt->h2==HD_ALIGN) { /* aligned */ len= len2/len1; p2[3]= p2[0]+len*(p2[0]-p2[-3]); @@ -2238,9 +2238,9 @@ void testhandlesNurb(Nurb *nu) a= nu->pntsu; while(a--) { flag= 0; - if(bezt->f1 & 1) flag++; - if(bezt->f2 & 1) flag += 2; - if(bezt->f3 & 1) flag += 4; + if(bezt->f1 & SELECT) flag++; + if(bezt->f2 & SELECT) flag += 2; + if(bezt->f3 & SELECT) flag += 4; if( !(flag==0 || flag==7) ) { if(bezt->h1==HD_AUTO) { /* auto */ diff --git a/source/blender/blenkernel/intern/ipo.c b/source/blender/blenkernel/intern/ipo.c index 6f6711a2a18..876f1c50a93 100644 --- a/source/blender/blenkernel/intern/ipo.c +++ b/source/blender/blenkernel/intern/ipo.c @@ -530,9 +530,9 @@ void testhandles_ipocurve(IpoCurve *icu) a= icu->totvert; while(a--) { flag= 0; - if(bezt->f1 & 1) flag++; - if(bezt->f2 & 1) flag += 2; - if(bezt->f3 & 1) flag += 4; + if(bezt->f1 & SELECT) flag++; + if(bezt->f2 & SELECT) flag += 2; + if(bezt->f3 & SELECT) flag += 4; if( !(flag==0 || flag==7) ) { if(bezt->h1==HD_AUTO) { /* auto */ @@ -2349,7 +2349,7 @@ void add_to_cfra_elem(ListBase *lb, BezTriple *bezt) if( ce->cfra==bezt->vec[1][0] ) { /* do because of double keys */ - if(bezt->f2 & 1) ce->sel= bezt->f2; + if(bezt->f2 & SELECT) ce->sel= bezt->f2; return; } else if(ce->cfra > bezt->vec[1][0]) break; |