diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-09-20 05:02:39 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-09-20 05:02:39 +0400 |
commit | 25c96bc9f348814d50095710c30ddc2776f5bb12 (patch) | |
tree | d462c55b492afaa4e52077475af8af984418c6fc /source/blender/editors | |
parent | 5d56a901a8b5f103cc2511941e70f6daa0bd9a3a (diff) |
code cleanup: remove unused macros, commet some which may be useful later - or good to keep for completeness. quieted some warnings and add flags -Wmissing-include-dirs and -Wno-div-by-zero to cmake/gcc
Diffstat (limited to 'source/blender/editors')
26 files changed, 17 insertions, 119 deletions
diff --git a/source/blender/editors/animation/fmodifier_ui.c b/source/blender/editors/animation/fmodifier_ui.c index e254fb7a3c4..30e4d8570cb 100644 --- a/source/blender/editors/animation/fmodifier_ui.c +++ b/source/blender/editors/animation/fmodifier_ui.c @@ -74,13 +74,6 @@ #define B_REDR 1 #define B_FMODIFIER_REDRAW 20 -/* macro for use here to draw background box and set height */ -// XXX for now, roundbox has it's callback func set to NULL to not intercept events -#define DRAW_BACKDROP(height) \ - { \ - uiDefBut(block, ROUNDBOX, B_REDR, "", -3, yco - height, width + 3, height - 1, NULL, 5.0, 0.0, 12.0, (float)rb_col, ""); \ - } (void)0 - /* callback to verify modifier data */ static void validate_fmodifier_cb(bContext *UNUSED(C), void *fcm_v, void *UNUSED(arg)) { diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index e343b1f9850..c0045580ede 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -79,10 +79,6 @@ #include "interface_intern.h" -#define MENU_WIDTH 120 -#define MENU_ITEM_HEIGHT 20 -#define MENU_SEP_HEIGHT 6 - #define PRECISION_FLOAT_MAX 6 #define PRECISION_FLOAT_MAX_POW 1000000 /* pow(10, PRECISION_FLOAT_MAX) */ diff --git a/source/blender/editors/interface/interface_draw.c b/source/blender/editors/interface/interface_draw.c index 0d325233db3..e7c7d934f9f 100644 --- a/source/blender/editors/interface/interface_draw.c +++ b/source/blender/editors/interface/interface_draw.c @@ -60,8 +60,6 @@ /* own include */ #include "interface_intern.h" -#define UI_DISABLED_ALPHA_OFFS -160 - static int roundboxtype = UI_CNR_ALL; void uiSetRoundBox(int type) diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c index 30d9a9a5ba1..468a2e4128b 100644 --- a/source/blender/editors/interface/interface_regions.c +++ b/source/blender/editors/interface/interface_regions.c @@ -70,7 +70,6 @@ #include "interface_intern.h" -#define MENU_SEPR_HEIGHT 6 #define B_NOP -1 #define MENU_SHADOW_SIDE 8 #define MENU_SHADOW_BOTTOM 10 @@ -1874,12 +1873,6 @@ static void ui_warp_pointer(int x, int y) /********************* Color Button ****************/ -/* picker sizes S hsize, F full size, D spacer, B button/pallette height */ -#define SPICK 110.0 -#define FPICK 180.0 -#define DPICK 6.0 -#define BPICK 24.0 - /* for picker, while editing hsv */ void ui_set_but_hsv(uiBut *but) { @@ -2053,10 +2046,6 @@ static void do_picker_new_mode_cb(bContext *UNUSED(C), void *bt1, void *UNUSED(a picker_new_hide_reveal(bt->block, colormode); } -/* picker sizes S hsize, F full size, D spacer, B button/pallette height */ -#define SPICK1 150.0 -#define DPICK1 6.0 - #define PICKER_H 150 #define PICKER_W 150 #define PICKER_SPACE 6 diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index 669da9f24c2..4b9d4978948 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -937,28 +937,26 @@ uiLayout *uiTemplateModifier(uiLayout *layout, bContext *C, PointerRNA *ptr) #include "BKE_action.h" #include "BKE_constraint.h" -#define REDRAWIPO 1 -#define REDRAWNLA 2 -#define REDRAWBUTSOBJECT 3 -#define REDRAWACTION 4 #define B_CONSTRAINT_TEST 5 -#define B_CONSTRAINT_CHANGETARGET 6 -#define REMAKEIPO 8 -#define B_DIFF 9 +// #define B_CONSTRAINT_CHANGETARGET 6 static void do_constraint_panels(bContext *C, void *ob_pt, int event) { - Main *bmain = CTX_data_main(C); - Scene *scene = CTX_data_scene(C); Object *ob = (Object *)ob_pt; switch (event) { case B_CONSTRAINT_TEST: break; /* no handling */ +#if 0 /* UNUSED */ case B_CONSTRAINT_CHANGETARGET: + { + Main *bmain = CTX_data_main(C); + Scene *scene = CTX_data_scene(C); if (ob->pose) ob->pose->flag |= POSE_RECALC; /* checks & sorts pose channels */ DAG_scene_sort(bmain, scene); break; + } +#endif default: break; } @@ -1270,8 +1268,6 @@ static void rna_update_cb(bContext *C, void *arg_cb, void *UNUSED(arg)) RNA_property_update(C, &cb->ptr, cb->prop); } -#define B_BANDCOL 1 - static void colorband_add_cb(bContext *C, void *cb_v, void *coba_v) { ColorBand *coba = coba_v; diff --git a/source/blender/editors/mesh/editmesh_knife.c b/source/blender/editors/mesh/editmesh_knife.c index 7ecfb712c18..b6e0ffa865d 100644 --- a/source/blender/editors/mesh/editmesh_knife.c +++ b/source/blender/editors/mesh/editmesh_knife.c @@ -29,7 +29,9 @@ * \ingroup edmesh */ -#define _USE_MATH_DEFINES +#ifdef _MSC_VER +# define _USE_MATH_DEFINES +#endif #include "MEM_guardedalloc.h" @@ -1753,6 +1755,9 @@ static int knife_update_active(KnifeTool_OpData *kcd) return 1; } +#define SCANFILL_CUTS 0 +#if SCANFILL_CUTS + #define MARK 4 #define DEL 8 #define VERT_ON_EDGE 16 @@ -1761,9 +1766,6 @@ static int knife_update_active(KnifeTool_OpData *kcd) #define BOUNDARY 128 #define FACE_NEW 256 -#define SCANFILL_CUTS 0 -#if SCANFILL_CUTS - typedef struct facenet_entry { struct facenet_entry *next, *prev; KnifeEdge *kfe; diff --git a/source/blender/editors/mesh/editmesh_loopcut.c b/source/blender/editors/mesh/editmesh_loopcut.c index 60c5244ddbc..8b13cc61d3e 100644 --- a/source/blender/editors/mesh/editmesh_loopcut.c +++ b/source/blender/editors/mesh/editmesh_loopcut.c @@ -29,7 +29,9 @@ */ #include <float.h> -#define _USE_MATH_DEFINES +#ifdef _MSC_VER +# define _USE_MATH_DEFINES +#endif #include <math.h> #include <string.h> #include <ctype.h> diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index 8f2e27a0ab4..28f8064a38f 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -2526,12 +2526,6 @@ void MESH_OT_solidify(wmOperatorType *ot) RNA_def_property_ui_range(prop, -10, 10, 0.1, 4); } -#define TRAIL_POLYLINE 1 /* For future use, They don't do anything yet */ -#define TRAIL_FREEHAND 2 -#define TRAIL_MIXED 3 /* (1|2) */ -#define TRAIL_AUTO 4 -#define TRAIL_MIDPOINTS 8 - typedef struct CutCurve { float x; float y; diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c index e9447530a98..2e1723027b8 100644 --- a/source/blender/editors/screen/screen_edit.c +++ b/source/blender/editors/screen/screen_edit.c @@ -705,10 +705,6 @@ static void screen_test_scale(bScreen *sc, int winsizex, int winsizey) /* *********************** DRAWING **************************************** */ - -#define SCR_BACK 0.55 -#define SCR_ROUND 12 - /* draw vertical shape visualizing future joining (left as well * right direction of future joining) */ static void draw_horizontal_join_shape(ScrArea *sa, char dir) diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c index bff0a2994e8..54d4ec790a6 100644 --- a/source/blender/editors/screen/screen_ops.c +++ b/source/blender/editors/screen/screen_ops.c @@ -1196,9 +1196,6 @@ static void SCREEN_OT_area_move(wmOperatorType *ot) * call exit() or cancel() and remove handler */ -#define SPLIT_STARTED 1 -#define SPLIT_PROGRESS 2 - typedef struct sAreaSplitData { int x, y; /* last used mouse position */ diff --git a/source/blender/editors/sculpt_paint/paint_image.c b/source/blender/editors/sculpt_paint/paint_image.c index a0e3cb1d20f..3dc890de5c0 100644 --- a/source/blender/editors/sculpt_paint/paint_image.c +++ b/source/blender/editors/sculpt_paint/paint_image.c @@ -240,8 +240,6 @@ typedef struct ImagePaintRegion { /* vert flags */ #define PROJ_VERT_CULL 1 -#define PI_80_DEG ((M_PI_2 / 9) * 8) - /* This is mainly a convenience struct used so we can keep an array of images we use * Thir imbufs, etc, in 1 array, When using threads this array is copied for each thread * because 'partRedrawRect' and 'touch' values would not be thread safe */ diff --git a/source/blender/editors/space_action/action_select.c b/source/blender/editors/space_action/action_select.c index ab2b473baa0..5da348b2a84 100644 --- a/source/blender/editors/space_action/action_select.c +++ b/source/blender/editors/space_action/action_select.c @@ -912,9 +912,6 @@ void ACTION_OT_select_leftright(wmOperatorType *ot) * selection mode between replacing the selection (without) and inverting the selection (with). */ -/* sensitivity factor for frame-selections */ -#define FRAME_CLICK_THRESH 0.1f - /* ------------------- */ /* option 1) select keyframe directly under mouse */ diff --git a/source/blender/editors/space_file/file_ops.c b/source/blender/editors/space_file/file_ops.c index 94967b264ed..fcbeb064e4d 100644 --- a/source/blender/editors/space_file/file_ops.c +++ b/source/blender/editors/space_file/file_ops.c @@ -64,11 +64,6 @@ #include <stdio.h> #include <ctype.h> -/* for events */ -#define NOTACTIVEFILE 0 -#define ACTIVATE 1 -#define INACTIVATE 2 - /* ---------- FILE SELECTION ------------ */ static FileSelection find_file_mouse_rect(SpaceFile *sfile, ARegion *ar, const rcti *rect) { diff --git a/source/blender/editors/space_graph/graph_buttons.c b/source/blender/editors/space_graph/graph_buttons.c index efe62eaf495..0d56b02e086 100644 --- a/source/blender/editors/space_graph/graph_buttons.c +++ b/source/blender/editors/space_graph/graph_buttons.c @@ -69,12 +69,6 @@ #include "graph_intern.h" // own include -/* XXX */ - -/* temporary definition for limits of float number buttons (FLT_MAX tends to infinity with old system) */ -#define UI_FLT_MAX 10000.0f - - /* ******************* graph editor space & buttons ************** */ #define B_REDR 1 diff --git a/source/blender/editors/space_image/image_buttons.c b/source/blender/editors/space_image/image_buttons.c index 3728d68fdbc..0b904f36a8c 100644 --- a/source/blender/editors/space_image/image_buttons.c +++ b/source/blender/editors/space_image/image_buttons.c @@ -71,28 +71,6 @@ #include "image_intern.h" -#define B_REDR 1 -#define B_IMAGECHANGED 2 -#define B_NOP 0 -#define B_TWINANIM 5 -#define B_SIMAGETILE 6 -#define B_IDNAME 10 -#define B_FACESEL_PAINT_TEST 11 -#define B_SIMA_RECORD 12 -#define B_SIMA_PLAY 13 - -#define B_SIMANOTHING 16 -#define B_SIMABRUSHCHANGE 17 -#define B_SIMABRUSHBROWSE 18 -#define B_SIMABRUSHLOCAL 19 -#define B_SIMABRUSHDELETE 20 -#define B_KEEPDATA 21 -#define B_SIMABTEXBROWSE 22 -#define B_SIMABTEXDELETE 23 -#define B_VPCOLSLI 24 -#define B_SIMACLONEBROWSE 25 -#define B_SIMACLONEDELETE 26 - /* proto */ static void image_info(Scene *scene, ImageUser *iuser, Image *ima, ImBuf *ibuf, char *str) diff --git a/source/blender/editors/space_image/image_draw.c b/source/blender/editors/space_image/image_draw.c index 52bb44d4e19..749ba75cfa1 100644 --- a/source/blender/editors/space_image/image_draw.c +++ b/source/blender/editors/space_image/image_draw.c @@ -78,8 +78,6 @@ #include "image_intern.h" -#define HEADER_HEIGHT 18 - static void draw_render_info(Scene *scene, Image *ima, ARegion *ar) { RenderResult *rr; diff --git a/source/blender/editors/space_logic/logic_window.c b/source/blender/editors/space_logic/logic_window.c index 6ffac1dcd34..b8a6af03ef6 100644 --- a/source/blender/editors/space_logic/logic_window.c +++ b/source/blender/editors/space_logic/logic_window.c @@ -91,7 +91,6 @@ #define B_SOUNDACT_BROWSE 2712 -#define B_SETSECTOR 2713 #define B_SETPROP 2714 #define B_SETACTOR 2715 #define B_SETMAINACTOR 2716 diff --git a/source/blender/editors/space_nla/nla_buttons.c b/source/blender/editors/space_nla/nla_buttons.c index 804d44ba720..18e983047cd 100644 --- a/source/blender/editors/space_nla/nla_buttons.c +++ b/source/blender/editors/space_nla/nla_buttons.c @@ -67,9 +67,6 @@ /* ******************* nla editor space & buttons ************** */ -#define B_NOP 1 -#define B_REDR 2 - /* -------------- */ static void do_nla_region_buttons(bContext *C, void *UNUSED(arg), int event) diff --git a/source/blender/editors/space_node/node_draw.c b/source/blender/editors/space_node/node_draw.c index fd14cf1a408..379e9987c4c 100644 --- a/source/blender/editors/space_node/node_draw.c +++ b/source/blender/editors/space_node/node_draw.c @@ -62,8 +62,6 @@ #include "node_intern.h" /* own include */ #include "COM_compositor.h" -/* width of socket columns in group display */ -#define NODE_GROUP_FRAME 120 /* XXX interface.h */ extern void ui_dropshadow(const rctf *rct, float radius, float aspect, float alpha, int select); diff --git a/source/blender/editors/space_node/node_templates.c b/source/blender/editors/space_node/node_templates.c index 7881014ed54..3d93a6c14a1 100644 --- a/source/blender/editors/space_node/node_templates.c +++ b/source/blender/editors/space_node/node_templates.c @@ -230,7 +230,7 @@ static void node_socket_add_replace(Main *bmain, bNodeTree *ntree, bNode *node_t /****************************** Node Link Menu *******************************/ -#define UI_NODE_LINK_ADD 0 +// #define UI_NODE_LINK_ADD 0 #define UI_NODE_LINK_DISCONNECT -1 #define UI_NODE_LINK_REMOVE -2 diff --git a/source/blender/editors/space_text/text_header.c b/source/blender/editors/space_text/text_header.c index b0cd6aeaab4..7dc3ec1ac60 100644 --- a/source/blender/editors/space_text/text_header.c +++ b/source/blender/editors/space_text/text_header.c @@ -59,17 +59,12 @@ #include "WM_types.h" - - - #ifdef WITH_PYTHON // XXX #include "BPY_menus.h" #endif #include "text_intern.h" -#define HEADER_PATH_MAX 260 - /* ************************ header area region *********************** */ /************************** properties ******************************/ diff --git a/source/blender/editors/space_text/text_python.c b/source/blender/editors/space_text/text_python.c index f980e19e9c8..966afe22e42 100644 --- a/source/blender/editors/space_text/text_python.c +++ b/source/blender/editors/space_text/text_python.c @@ -180,13 +180,9 @@ static void confirm_suggestion(Text *text, int skipleft) } // XXX -#define L_MOUSE 0 -#define M_MOUSE 0 -#define R_MOUSE 0 #define LR_SHIFTKEY 0 #define LR_ALTKEY 0 #define LR_CTRLKEY 0 -#define LR_OSKEY 0 // XXX static int doc_scroll = 0; diff --git a/source/blender/editors/space_view3d/view3d_buttons.c b/source/blender/editors/space_view3d/view3d_buttons.c index c819637fd04..c8aca5674a4 100644 --- a/source/blender/editors/space_view3d/view3d_buttons.c +++ b/source/blender/editors/space_view3d/view3d_buttons.c @@ -83,7 +83,6 @@ /* ******************* view3d space & buttons ************** */ -#define B_NOP 1 #define B_REDR 2 #define B_OBJECTPANELMEDIAN 1008 diff --git a/source/blender/editors/space_view3d/view3d_header.c b/source/blender/editors/space_view3d/view3d_header.c index 90342fab246..b2ae63df662 100644 --- a/source/blender/editors/space_view3d/view3d_header.c +++ b/source/blender/editors/space_view3d/view3d_header.c @@ -96,7 +96,6 @@ static void do_view3d_header_buttons(bContext *C, void *arg, int event); #define B_MAN_ROT 117 #define B_MAN_SCALE 118 #define B_MAN_MODE 120 -#define B_NOP 123 /* XXX quickly ported across */ static void handle_view3d_lock(bContext *C) diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c index a10cc38b6c5..b16fc5a8b2d 100644 --- a/source/blender/editors/space_view3d/view3d_select.c +++ b/source/blender/editors/space_view3d/view3d_select.c @@ -319,11 +319,6 @@ static int edge_inside_rect(rcti *rect, short x1, short y1, short x2, short y2) return 1; } - -#define MOVES_GESTURE 50 -#define MOVES_LASSO 500 - - /* warning; lasso select with backbuffer-check draws in backbuf with persp(PERSP_WIN) * and returns with persp(PERSP_VIEW). After lasso select backbuf is not OK */ diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index 28eedfbf9d7..022e9177a4a 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -1773,9 +1773,6 @@ void flushTransParticles(TransInfo *t) /* ********************* mesh ****************** */ -/* proportional distance based on connectivity */ -#define THRESHOLDFACTOR (1.0f - 0.0001f) - /* I did this wrong, it should be a breadth-first search * but instead it's a depth-first search, fudged * to report shortest distances. I have no idea how fast |