[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12752] trunk/blender/source/blender: minor update, "Draw Handles" wasnt working when disabled everywhere and replaced some magic numbers
Campbell Barton
ideasman42 at gmail.com
Sun Dec 2 00:25:01 CET 2007
Revision: 12752
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12752
Author: campbellbarton
Date: 2007-12-02 00:25:00 +0100 (Sun, 02 Dec 2007)
Log Message:
-----------
minor update, "Draw Handles" wasnt working when disabled everywhere and replaced some magic numbers
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/curve.c
trunk/blender/source/blender/blenkernel/intern/ipo.c
trunk/blender/source/blender/include/blendef.h
trunk/blender/source/blender/python/api2_2x/Curve.c
trunk/blender/source/blender/src/buttons_editing.c
trunk/blender/source/blender/src/drawipo.c
trunk/blender/source/blender/src/drawobject.c
trunk/blender/source/blender/src/drawview.c
trunk/blender/source/blender/src/edit.c
trunk/blender/source/blender/src/editcurve.c
trunk/blender/source/blender/src/editipo.c
trunk/blender/source/blender/src/editipo_lib.c
trunk/blender/source/blender/src/editipo_mods.c
trunk/blender/source/blender/src/editobject.c
trunk/blender/source/blender/src/editview.c
trunk/blender/source/blender/src/transform_conversions.c
Modified: trunk/blender/source/blender/blenkernel/intern/curve.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/curve.c 2007-12-01 22:00:09 UTC (rev 12751)
+++ trunk/blender/source/blender/blenkernel/intern/curve.c 2007-12-01 23:25:00 UTC (rev 12752)
@@ -1539,8 +1539,8 @@
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 @@
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 @@
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 @@
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 */
Modified: trunk/blender/source/blender/blenkernel/intern/ipo.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/ipo.c 2007-12-01 22:00:09 UTC (rev 12751)
+++ trunk/blender/source/blender/blenkernel/intern/ipo.c 2007-12-01 23:25:00 UTC (rev 12752)
@@ -530,9 +530,9 @@
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 @@
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;
Modified: trunk/blender/source/blender/include/blendef.h
===================================================================
--- trunk/blender/source/blender/include/blendef.h 2007-12-01 22:00:09 UTC (rev 12751)
+++ trunk/blender/source/blender/include/blendef.h 2007-12-01 23:25:00 UTC (rev 12752)
@@ -122,6 +122,8 @@
#define ISPOIN4(a, b, c, d, e) ( (a->b) && (a->c) && (a->d) && (a->e) )
#define BEZSELECTED(bezt) (((bezt)->f1 & 1) || ((bezt)->f2 & 1) || ((bezt)->f3 & 1))
+/* for curve objects in editmode that can have hidden handles - may use for IPO's later */
+#define BEZSELECTED_HIDDENHANDLES(bezt) ((G.f & G_HIDDENHANDLES) ? (bezt)->f2 & 1 : BEZSELECTED(bezt))
/* psfont */
#define FNT_PDRAW 1
Modified: trunk/blender/source/blender/python/api2_2x/Curve.c
===================================================================
--- trunk/blender/source/blender/python/api2_2x/Curve.c 2007-12-01 22:00:09 UTC (rev 12751)
+++ trunk/blender/source/blender/python/api2_2x/Curve.c 2007-12-01 23:25:00 UTC (rev 12752)
@@ -821,9 +821,9 @@
new_nurb->type = CU_BEZIER;
new_nurb->bezt->h1 = HD_ALIGN;
new_nurb->bezt->h2 = HD_ALIGN;
- new_nurb->bezt->f1 = 1;
- new_nurb->bezt->f2 = 1;
- new_nurb->bezt->f3 = 1;
+ new_nurb->bezt->f1 = SELECT;
+ new_nurb->bezt->f2 = SELECT;
+ new_nurb->bezt->f3 = SELECT;
new_nurb->bezt->hide = 0;
/* calchandlesNurb( new_nurb ); */
} else { /* set up bp */
Modified: trunk/blender/source/blender/src/buttons_editing.c
===================================================================
--- trunk/blender/source/blender/src/buttons_editing.c 2007-12-01 22:00:09 UTC (rev 12751)
+++ trunk/blender/source/blender/src/buttons_editing.c 2007-12-01 23:25:00 UTC (rev 12752)
@@ -521,14 +521,14 @@
while(a--) {
if(bezt->hide==0) {
if(event==B_MATSEL) {
- bezt->f1 |= 1;
- bezt->f2 |= 1;
- bezt->f3 |= 1;
+ bezt->f1 |= SELECT;
+ bezt->f2 |= SELECT;
+ bezt->f3 |= SELECT;
}
else {
- bezt->f1 &= ~1;
- bezt->f2 &= ~1;
- bezt->f3 &= ~1;
+ bezt->f1 &= ~SELECT;
+ bezt->f2 &= ~SELECT;
+ bezt->f3 &= ~SELECT;
}
}
bezt++;
Modified: trunk/blender/source/blender/src/drawipo.c
===================================================================
--- trunk/blender/source/blender/src/drawipo.c 2007-12-01 22:00:09 UTC (rev 12751)
+++ trunk/blender/source/blender/src/drawipo.c 2007-12-01 23:25:00 UTC (rev 12752)
@@ -1190,7 +1190,7 @@
ok= 0;
if(ei->flag & IPO_EDIT) {
- if( (bezt->f2 & 1) == sel ) ok= 1;
+ if( (bezt->f2 & SELECT) == sel ) ok= 1;
}
else ok= 1;
@@ -1212,15 +1212,15 @@
if(ei->flag & IPO_EDIT) {
if(ei->icu->ipo==IPO_BEZ) {
/* Draw the editmode hendels for a bezier curve */
- if( (bezt->f1 & 1) == sel)/* && G.v2d->cur.xmin < bezt->vec[0][0] < G.v2d->cur.xmax)*/
+ if( (bezt->f1 & SELECT) == sel)/* && G.v2d->cur.xmin < bezt->vec[0][0] < G.v2d->cur.xmax)*/
bglVertex3fv(bezt->vec[0]);
- if( (bezt->f3 & 1) == sel)/* && G.v2d->cur.xmin < bezt->vec[2][0] < G.v2d->cur.xmax)*/
+ if( (bezt->f3 & SELECT) == sel)/* && G.v2d->cur.xmin < bezt->vec[2][0] < G.v2d->cur.xmax)*/
bglVertex3fv(bezt->vec[2]);
}
- if( (bezt->f2 & 1) == sel) /* && G.v2d->cur.xmin < bezt->vec[1][0] < G.v2d->cur.xmax)*/
+ if( (bezt->f2 & SELECT) == sel) /* && G.v2d->cur.xmin < bezt->vec[1][0] < G.v2d->cur.xmax)*/
bglVertex3fv(bezt->vec[1]);
}
@@ -1261,7 +1261,7 @@
b= ei->icu->totvert;
while(b--) {
- if( (bezt->f2 & 1)==sel) {
+ if( (bezt->f2 & SELECT)==sel) {
fp= bezt->vec[0];
cpack(col[bezt->h1]);
@@ -1282,7 +1282,7 @@
glVertex2fv(fp); glVertex2fv(fp+3);
glEnd();
}
- else if( (bezt->f3 & 1)==sel) {
+ else if( (bezt->f3 & SELECT)==sel) {
fp= bezt->vec[1];
cpack(col[bezt->h2]);
@@ -1730,16 +1730,16 @@
b= ei->icu->totvert;
while(b--) {
// all three selected
- if(bezt->f2 & 1) {
+ if(bezt->f2 & SELECT) {
VecAddf(median, median, bezt->vec[1]);
tot++;
}
else {
- if(bezt->f1 & 1) {
+ if(bezt->f1 & SELECT) {
VecAddf(median, median, bezt->vec[0]);
tot++;
}
- if(bezt->f3 & 1) {
+ if(bezt->f3 & SELECT) {
VecAddf(median, median, bezt->vec[2]);
tot++;
}
@@ -1824,16 +1824,16 @@
b= ei->icu->totvert;
while(b--) {
// all three selected
- if(bezt->f2 & 1) {
+ if(bezt->f2 & SELECT) {
VecAddf(bezt->vec[0], bezt->vec[0], median);
VecAddf(bezt->vec[1], bezt->vec[1], median);
VecAddf(bezt->vec[2], bezt->vec[2], median);
}
else {
- if(bezt->f1 & 1) {
+ if(bezt->f1 & SELECT) {
VecAddf(bezt->vec[0], bezt->vec[0], median);
}
- if(bezt->f3 & 1) {
+ if(bezt->f3 & SELECT) {
VecAddf(bezt->vec[2], bezt->vec[2], median);
}
}
Modified: trunk/blender/source/blender/src/drawobject.c
===================================================================
--- trunk/blender/source/blender/src/drawobject.c 2007-12-01 22:00:09 UTC (rev 12751)
+++ trunk/blender/source/blender/src/drawobject.c 2007-12-01 23:25:00 UTC (rev 12752)
@@ -3729,7 +3729,7 @@
a= nu->pntsu;
while(a--) {
if(bezt->hide==0) {
- if( (bezt->f2 & 1)==sel) {
+ if( (bezt->f2 & SELECT)==sel) {
fp= bezt->vec[0];
cpack(col[bezt->h1]);
@@ -3740,14 +3740,14 @@
glVertex3fv(fp+3);
glVertex3fv(fp+6);
}
- else if( (bezt->f1 & 1)==sel) {
+ else if( (bezt->f1 & SELECT)==sel) {
fp= bezt->vec[0];
cpack(col[bezt->h1]);
glVertex3fv(fp);
glVertex3fv(fp+3);
}
- else if( (bezt->f3 & 1)==sel) {
+ else if( (bezt->f3 & SELECT)==sel) {
fp= bezt->vec[1];
cpack(col[bezt->h2]);
@@ -3785,11 +3785,11 @@
while(a--) {
if(bezt->hide==0) {
if (G.f & G_HIDDENHANDLES) {
- if((bezt->f2 & 1)==sel) bglVertex3fv(bezt->vec[1]);
+ if((bezt->f2 & SELECT)==sel) bglVertex3fv(bezt->vec[1]);
} else {
- if((bezt->f1 & 1)==sel) bglVertex3fv(bezt->vec[0]);
- if((bezt->f2 & 1)==sel) bglVertex3fv(bezt->vec[1]);
- if((bezt->f3 & 1)==sel) bglVertex3fv(bezt->vec[2]);
+ if((bezt->f1 & SELECT)==sel) bglVertex3fv(bezt->vec[0]);
+ if((bezt->f2 & SELECT)==sel) bglVertex3fv(bezt->vec[1]);
+ if((bezt->f3 & SELECT)==sel) bglVertex3fv(bezt->vec[2]);
}
}
bezt++;
Modified: trunk/blender/source/blender/src/drawview.c
===================================================================
--- trunk/blender/source/blender/src/drawview.c 2007-12-01 22:00:09 UTC (rev 12751)
+++ trunk/blender/source/blender/src/drawview.c 2007-12-01 23:25:00 UTC (rev 12752)
@@ -1637,18 +1637,18 @@
bezt= nu->bezt;
a= nu->pntsu;
while(a--) {
- if(bezt->f2 & 1) {
+ if(bezt->f2 & SELECT) {
VecAddf(median, median, bezt->vec[1]);
tot++;
median[4]+= bezt->weight;
totweight++;
}
else {
- if(bezt->f1 & 1) {
+ if(bezt->f1 & SELECT) {
VecAddf(median, median, bezt->vec[0]);
tot++;
}
- if(bezt->f3 & 1) {
+ if(bezt->f3 & SELECT) {
VecAddf(median, median, bezt->vec[2]);
tot++;
}
@@ -1811,17 +1811,17 @@
bezt= nu->bezt;
a= nu->pntsu;
while(a--) {
- if(bezt->f2 & 1) {
+ if(bezt->f2 & SELECT) {
VecAddf(bezt->vec[0], bezt->vec[0], median);
VecAddf(bezt->vec[1], bezt->vec[1], median);
VecAddf(bezt->vec[2], bezt->vec[2], median);
bezt->weight+= median[4];
}
else {
- if(bezt->f1 & 1) {
+ if(bezt->f1 & SELECT) {
VecAddf(bezt->vec[0], bezt->vec[0], median);
}
- if(bezt->f3 & 1) {
+ if(bezt->f3 & SELECT) {
VecAddf(bezt->vec[2], bezt->vec[2], median);
}
}
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list