diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-01-15 19:14:57 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-01-15 19:14:57 +0300 |
commit | 86bbab7de53b07ad9a45b11dbff6bd5c0ee40c14 (patch) | |
tree | d3c0085903e25c08fcedf1426de535e27c9b2526 /source/blender/editors | |
parent | f66912a3351fc094e30daa5de53bef734493ad66 (diff) |
remove/comment unused defines.
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/animation/anim_markers.c | 2 | ||||
-rw-r--r-- | source/blender/editors/include/ED_render.h | 2 | ||||
-rw-r--r-- | source/blender/editors/include/UI_interface.h | 13 | ||||
-rw-r--r-- | source/blender/editors/interface/interface_intern.h | 5 | ||||
-rw-r--r-- | source/blender/editors/mesh/mesh_intern.h | 6 | ||||
-rw-r--r-- | source/blender/editors/space_sequencer/sequencer_add.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/view3d_intern.h | 6 | ||||
-rw-r--r-- | source/blender/editors/transform/transform.h | 4 | ||||
-rw-r--r-- | source/blender/editors/uvedit/uvedit_intern.h | 3 |
9 files changed, 10 insertions, 33 deletions
diff --git a/source/blender/editors/animation/anim_markers.c b/source/blender/editors/animation/anim_markers.c index 32380af6a1d..e1a3d8d2fa0 100644 --- a/source/blender/editors/animation/anim_markers.c +++ b/source/blender/editors/animation/anim_markers.c @@ -692,7 +692,7 @@ static int ed_marker_move_modal(bContext *C, wmOperator *op, wmEvent *evt) if (ELEM(mm->slink->spacetype, SPACE_TIME, SPACE_SOUND)) apply_keyb_grid(evt->shift, evt->ctrl, &fac, 0.0, FPS, 0.1*FPS, 0); else - apply_keyb_grid(evt->shift, evt->ctrl, &fac, 0.0, 1.0, 0.1, U.flag & USER_AUTOGRABGRID); + apply_keyb_grid(evt->shift, evt->ctrl, &fac, 0.0, 1.0, 0.1, 0 /*was: U.flag & USER_AUTOGRABGRID*/); offs= (int)fac; RNA_int_set(op->ptr, "frames", offs); diff --git a/source/blender/editors/include/ED_render.h b/source/blender/editors/include/ED_render.h index f34670da471..44d76b635a1 100644 --- a/source/blender/editors/include/ED_render.h +++ b/source/blender/editors/include/ED_render.h @@ -43,8 +43,6 @@ void ED_render_id_flush_update(struct Main *bmain, struct ID *id); /* render_preview.c */ -#define _RENDERSIZE 140 - /* stores rendered preview - is also used for icons */ typedef struct RenderInfo { int pr_rectx; diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h index fdb930e5f02..1ea4f88ebe6 100644 --- a/source/blender/editors/include/UI_interface.h +++ b/source/blender/editors/include/UI_interface.h @@ -95,9 +95,9 @@ typedef struct uiLayout uiLayout; #define UI_BLOCK_REDRAW 2 #define UI_BLOCK_RET_1 4 /* XXX 2.5 not implemented */ #define UI_BLOCK_NUMSELECT 8 -#define UI_BLOCK_ENTER_OK 16 -#define UI_BLOCK_NOSHADOW 32 -#define UI_BLOCK_UNUSED 64 +/*#define UI_BLOCK_ENTER_OK 16*/ /*UNUSED*/ +/*#define UI_BLOCK_NOSHADOW 32*/ /*UNUSED*/ +/*#define UI_BLOCK_UNUSED 64*/ /*UNUSED*/ #define UI_BLOCK_MOVEMOUSE_QUIT 128 #define UI_BLOCK_KEEP_OPEN 256 #define UI_BLOCK_POPUP 512 @@ -114,13 +114,8 @@ typedef struct uiLayout uiLayout; /* block->flag bits 12-15 are identical to but->flag bits */ /* panel controls */ -#define UI_PNL_TRANSP 1 #define UI_PNL_SOLID 2 - #define UI_PNL_CLOSE 32 -#define UI_PNL_STOW 64 -#define UI_PNL_TO_MOUSE 128 -#define UI_PNL_UNSTOW 256 #define UI_PNL_SCALE 512 /* warning the first 6 flags are internal */ @@ -172,7 +167,7 @@ typedef struct uiLayout uiLayout; #define SHO 64 #define INT 96 #define FLO 128 -#define FUN 192 +/*#define FUN 192*/ /*UNUSED*/ #define BIT 256 #define BUTPOIN (128+64+32) diff --git a/source/blender/editors/interface/interface_intern.h b/source/blender/editors/interface/interface_intern.h index 72f6e72cd5d..95b808fe4b1 100644 --- a/source/blender/editors/interface/interface_intern.h +++ b/source/blender/editors/interface/interface_intern.h @@ -96,7 +96,6 @@ typedef enum { #define UI_MAX_DRAW_STR 400 #define UI_MAX_NAME_STR 128 -#define UI_ARRAY 29 /* panel limits */ #define UI_PANEL_MINX 100 @@ -104,7 +103,7 @@ typedef enum { /* uiBut->flag */ #define UI_SELECT 1 /* use when the button is pressed */ -#define UI_MOUSE_OVER 2 +/*#define UI_MOUSE_OVER 2*/ /*UNUSED, free flag*/ #define UI_ACTIVE 4 #define UI_HAS_ICON 8 #define UI_TEXTINPUT 16 @@ -120,7 +119,7 @@ typedef enum { #define PNL_CLOSEDX 2 #define PNL_CLOSEDY 4 #define PNL_CLOSED 6 -#define PNL_TABBED 8 +/*#define PNL_TABBED 8*/ /*UNUSED*/ #define PNL_OVERLAP 16 /* Button text selection: diff --git a/source/blender/editors/mesh/mesh_intern.h b/source/blender/editors/mesh/mesh_intern.h index a9cbf246056..1a9fdcea992 100644 --- a/source/blender/editors/mesh/mesh_intern.h +++ b/source/blender/editors/mesh/mesh_intern.h @@ -36,9 +36,6 @@ struct bContext; struct wmOperatorType; struct wmOperator; - -#define UVCOPY(t, s) memcpy(t, s, 2 * sizeof(float)); - /* ******************** editface.c */ int edgetag_context_check(Scene *scene, EditEdge *eed); @@ -136,9 +133,6 @@ extern int EM_view3d_poll(struct bContext *C); /* ******************* editmesh_loop.c */ -#define LOOP_SELECT 1 -#define LOOP_CUT 2 - void MESH_OT_knife_cut(struct wmOperatorType *ot); /* ******************* editmesh_mods.c */ diff --git a/source/blender/editors/space_sequencer/sequencer_add.c b/source/blender/editors/space_sequencer/sequencer_add.c index ad54eff1fd4..c1e01e2ac53 100644 --- a/source/blender/editors/space_sequencer/sequencer_add.c +++ b/source/blender/editors/space_sequencer/sequencer_add.c @@ -78,6 +78,8 @@ #define SEQPROP_FILES (1<<2) #define SEQPROP_NOPATHS (1<<3) +#define SELECT 1 + static void sequencer_generic_props__internal(wmOperatorType *ot, int flag) { if(flag & SEQPROP_STARTFRAME) diff --git a/source/blender/editors/space_view3d/view3d_intern.h b/source/blender/editors/space_view3d/view3d_intern.h index 06d457778b2..73c07e8ac25 100644 --- a/source/blender/editors/space_view3d/view3d_intern.h +++ b/source/blender/editors/space_view3d/view3d_intern.h @@ -54,12 +54,6 @@ struct bMotionPath; #define DRAW_CONSTCOLOR 2 #define DRAW_SCENESET 4 -#define V3D_XRAY 1 -#define V3D_TRANSP 2 -#define V3D_XRAYTRANSP 4 - -#define V3D_SELECT_MOUSE 1 - /* view3d_header.c */ void view3d_header_buttons(const struct bContext *C, struct ARegion *ar); void VIEW3D_OT_layers(struct wmOperatorType *ot); diff --git a/source/blender/editors/transform/transform.h b/source/blender/editors/transform/transform.h index ac32ab45438..b4a25416dfe 100644 --- a/source/blender/editors/transform/transform.h +++ b/source/blender/editors/transform/transform.h @@ -424,7 +424,7 @@ typedef struct TransInfo { #define TD_USEQUAT (1 << 3) #define TD_NOTCONNECTED (1 << 4) #define TD_SINGLESIZE (1 << 5) /* used for scaling of MetaElem->rad */ -#define TD_TIMEONLY (1 << 8) +/*#define TD_TIMEONLY (1 << 8) */ /*UNUSED*/ #define TD_NOCENTER (1 << 9) #define TD_NO_EXT (1 << 10) /* ext abused for particle key timing */ #define TD_SKIP (1 << 11) /* don't transform this data */ @@ -660,8 +660,6 @@ TransDataCurveHandleFlags *initTransDataCurveHandes(TransData *td, struct BezTri /* DRAWLINE options flags */ #define DRAWLIGHT 1 -#define DRAWDASHED 2 -#define DRAWBOLD 4 void applyTransObjects(TransInfo *t); void restoreTransObjects(TransInfo *t); diff --git a/source/blender/editors/uvedit/uvedit_intern.h b/source/blender/editors/uvedit/uvedit_intern.h index d6ba9fb0c2c..2c412697de3 100644 --- a/source/blender/editors/uvedit/uvedit_intern.h +++ b/source/blender/editors/uvedit/uvedit_intern.h @@ -37,9 +37,6 @@ struct Image; struct Object; struct wmOperatorType; -#define UV_SELECT_ALL 1 -#define UV_SELECT_PINNED 2 - /* id can be from 0 to 3 */ #define TF_PIN_MASK(id) (TF_PIN1 << id) #define TF_SEL_MASK(id) (TF_SEL1 << id) |