From 114ce86167b0000428304c5675719cfff3a771d7 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 11 Dec 2007 14:19:05 +0000 Subject: display real fps in 3d view option replace 1 with SELECT edited DVar texture tooltip --- source/blender/src/editview.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'source/blender/src/editview.c') diff --git a/source/blender/src/editview.c b/source/blender/src/editview.c index c5d7ce231c7..b3252487fa6 100644 --- a/source/blender/src/editview.c +++ b/source/blender/src/editview.c @@ -533,7 +533,7 @@ static void do_lasso_select_curve__doSelect(void *userData, Nurb *nu, BPoint *bp if (lasso_inside(data->mcords, data->moves, x, y)) { if (bp) { - bp->f1 = data->select?(bp->f1|1):(bp->f1&~1); + bp->f1 = data->select?(bp->f1|SELECT):(bp->f1&~SELECT); } else { if (G.f & G_HIDDENHANDLES) { /* can only be beztindex==0 here since handles are hidden */ @@ -566,7 +566,7 @@ static void do_lasso_select_lattice__doSelect(void *userData, BPoint *bp, int x, struct { short (*mcords)[2]; short moves; short select; } *data = userData; if (lasso_inside(data->mcords, data->moves, x, y)) { - bp->f1 = data->select?(bp->f1|1):(bp->f1&~1); + bp->f1 = data->select?(bp->f1|SELECT):(bp->f1&~SELECT); } } static void do_lasso_select_lattice(short mcords[][2], short moves, short select) @@ -1599,7 +1599,7 @@ static void do_nurbs_box_select__doSelect(void *userData, Nurb *nu, BPoint *bp, if (BLI_in_rcti(data->rect, x, y)) { if (bp) { - bp->f1 = data->select?(bp->f1|1):(bp->f1&~1); + bp->f1 = data->select?(bp->f1|SELECT):(bp->f1&~SELECT); } else { if (G.f & G_HIDDENHANDLES) { /* can only be beztindex==0 here since handles are hidden */ @@ -1631,7 +1631,7 @@ static void do_lattice_box_select__doSelect(void *userData, BPoint *bp, int x, i struct { rcti *rect; int select; } *data = userData; if (BLI_in_rcti(data->rect, x, y)) { - bp->f1 = data->select?(bp->f1|1):(bp->f1&~1); + bp->f1 = data->select?(bp->f1|SELECT):(bp->f1&~SELECT); } } static void do_lattice_box_select(rcti *rect, int select) @@ -2083,7 +2083,7 @@ static void latticecurve_selectionCB__doSelect(void *userData, BPoint *bp, int x float r = sqrt(mx*mx + my*my); if (r<=data->radius) { - bp->f1 = data->select?(bp->f1|1):(bp->f1&~1); + bp->f1 = data->select?(bp->f1|SELECT):(bp->f1&~SELECT); } } static void lattice_selectionCB(int selecting, Object *editobj, short *mval, float rad) -- cgit v1.2.3