A little bit of code cleanup:

* Moved BEZSELECTED macro to blendef.h as it is used in several files
* Removed other duplicated macros
This commit is contained in:
Joshua Leung
2006-12-11 03:47:15 +00:00
parent b69fdd21ba
commit c41e0e205f
6 changed files with 2 additions and 22 deletions

View File

@@ -114,6 +114,7 @@
#define ISPOIN3(a, b, c, d) ( (a->b) && (a->c) && (a->d) )
#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))
/* psfont */
#define FNT_PDRAW 1

View File

@@ -95,9 +95,6 @@
#include "blendef.h"
#include "nla.h"
/* Useful macros ----------------------------------------------- */
#define BEZSELECTED(bezt) (((bezt)->f1 & 1) || ((bezt)->f2 & 1) || ((bezt)->f3 & 1))
/* Local Function prototypes, are forward needed */
static void hilight_channel (bAction *act, bActionChannel *chan, short hilight);

View File

@@ -94,12 +94,9 @@
#include "mydevice.h"
#include "blendef.h"
#include "BDR_editcurve.h"
/* still need to eradicate a few :( */
#define callocstructN(x,y,name) (x*)MEM_callocN((y)* sizeof(x),name)
/* only used sparingly: */
#define BEZSELECTED(bezt) (((bezt)->f1 & 1) || ((bezt)->f2 & 1) || ((bezt)->f3 & 1))
ListBase editNurb;

View File

@@ -130,11 +130,7 @@ extern int te_ar[];
extern int fluidsim_ar[]; // NT
/* forwards */
#define BEZSELECTED(bezt) (((bezt)->f1 & 1) || ((bezt)->f2 & 1) || ((bezt)->f3 & 1))
#define IPOTHRESH 0.9
#define ISPOIN(a, b, c) ( (a->b) && (a->c) )
#define ISPOIN3(a, b, c, d) ( (a->b) && (a->c) && (a->d) )
/* tests if only one editipo is active */
static void check_active_editipo(void)

View File

@@ -74,13 +74,6 @@
#include "blendef.h"
#include "mydevice.h"
/* copy from editipo.c */
#define BEZSELECTED(bezt) (((bezt)->f1 & 1) || ((bezt)->f2 & 1) || ((bezt)->f3 & 1))
#define ISPOIN(a, b, c) ( (a->b) && (a->c) )
#define ISPOIN3(a, b, c, d) ( (a->b) && (a->c) && (a->d) )
#define ISPOIN4(a, b, c, d, e) ( (a->b) && (a->c) && (a->d) && (a->e) )
extern int totipo_edit, totipo_sel, totipo_vertsel, totipo_vis;
void ipo_toggle_showkey(void)
@@ -157,7 +150,7 @@ void swap_selectall_editipo(void)
}
BIF_undo_push("Swap select all Ipo");
BIF_undo_push("Swap Select All Ipo");
scrarea_queue_winredraw(curarea);
}

View File

@@ -177,10 +177,6 @@
#include "BIF_poseobject.h"
/* used in editipo, editcurve and here */
#define BEZSELECTED(bezt) (((bezt)->f1 & 1) || ((bezt)->f2 & 1) || ((bezt)->f3 & 1))
/* local prototypes -------------*/
/* --------------------------------- */