diff --git a/source/blender/blenkernel/intern/lib_override.cc b/source/blender/blenkernel/intern/lib_override.cc index 215759a8e50..4629c7c146a 100644 --- a/source/blender/blenkernel/intern/lib_override.cc +++ b/source/blender/blenkernel/intern/lib_override.cc @@ -67,8 +67,7 @@ #include "lib_intern.hh" -#define OVERRIDE_AUTO_CHECK_DELAY 0.2 /* 200ms between auto-override checks. */ -//#define DEBUG_OVERRIDE_TIMEIT +// #define DEBUG_OVERRIDE_TIMEIT #ifdef DEBUG_OVERRIDE_TIMEIT # include "PIL_time_utildefines.h" diff --git a/source/blender/blenkernel/intern/studiolight.cc b/source/blender/blenkernel/intern/studiolight.cc index 68f4b698dc7..b3f28bd572c 100644 --- a/source/blender/blenkernel/intern/studiolight.cc +++ b/source/blender/blenkernel/intern/studiolight.cc @@ -38,7 +38,6 @@ /* Statics */ static ListBase studiolights; static int last_studiolight_id = 0; -#define STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE 96 #define STUDIOLIGHT_PASSNAME_DIFFUSE "diffuse" #define STUDIOLIGHT_PASSNAME_SPECULAR "specular" diff --git a/source/blender/blenlib/BLI_winstuff.h b/source/blender/blenlib/BLI_winstuff.h index 4df7607d18d..4fe5d06c5e0 100644 --- a/source/blender/blenlib/BLI_winstuff.h +++ b/source/blender/blenlib/BLI_winstuff.h @@ -46,8 +46,6 @@ extern "C" { # define _USE_MATH_DEFINES #endif -#define MAXPATHLEN MAX_PATH - #ifndef S_ISREG # define S_ISREG(x) (((x)&_S_IFREG) == _S_IFREG) #endif diff --git a/source/blender/blenloader/intern/writefile.cc b/source/blender/blenloader/intern/writefile.cc index d92276ec10f..a79fb19fd3a 100644 --- a/source/blender/blenloader/intern/writefile.cc +++ b/source/blender/blenloader/intern/writefile.cc @@ -762,9 +762,6 @@ static void writelist_id(WriteData *wd, int filecode, const char *structname, co #define writestruct(wd, filecode, struct_id, nr, adr) \ writestruct_nr(wd, filecode, SDNA_TYPE_FROM_STRUCT(struct_id), nr, adr) -#define writelist(wd, filecode, struct_id, lb) \ - writelist_nr(wd, filecode, SDNA_TYPE_FROM_STRUCT(struct_id), lb) - /** \} */ /* -------------------------------------------------------------------- */ diff --git a/source/blender/editors/include/ED_anim_api.hh b/source/blender/editors/include/ED_anim_api.hh index 6eb7f46f705..e814a10ca33 100644 --- a/source/blender/editors/include/ED_anim_api.hh +++ b/source/blender/editors/include/ED_anim_api.hh @@ -454,9 +454,6 @@ ENUM_OPERATORS(eAnimFilter_Flags, ANIMFILTER_TMP_IGNORE_ONLYSEL); /** Track widths */ #define NLATRACK_NAMEWIDTH (10 * U.widget_unit) -/** Track toggle-buttons */ -#define NLATRACK_BUTTON_WIDTH (0.8f * U.widget_unit) - /** \} */ /* -------------------------------------------------------------------- */ diff --git a/source/blender/editors/include/ED_transform.hh b/source/blender/editors/include/ED_transform.hh index 1722949df45..24869d9f413 100644 --- a/source/blender/editors/include/ED_transform.hh +++ b/source/blender/editors/include/ED_transform.hh @@ -119,10 +119,9 @@ int BIF_countTransformOrientation(const bContext *C); #define P_CENTER (1 << 14) #define P_GPENCIL_EDIT (1 << 15) #define P_CURSOR_EDIT (1 << 16) -#define P_CLNOR_INVALIDATE (1 << 17) -#define P_VIEW2D_EDGE_PAN (1 << 18) +#define P_VIEW2D_EDGE_PAN (1 << 17) /* For properties performed when confirming the transformation. */ -#define P_POST_TRANSFORM (1 << 19) +#define P_POST_TRANSFORM (1 << 18) void Transform_Properties(wmOperatorType *ot, int flags); diff --git a/source/blender/editors/screen/area.cc b/source/blender/editors/screen/area.cc index 1b9ceef4c04..8a99a778158 100644 --- a/source/blender/editors/screen/area.cc +++ b/source/blender/editors/screen/area.cc @@ -985,10 +985,10 @@ static bool region_background_is_transparent(const ScrArea *area, const ARegion return back[3] < 50; } -#define AZONEPAD_EDGE (0.1f * U.widget_unit) -#define AZONEPAD_ICON (0.45f * U.widget_unit) static void region_azone_edge(const ScrArea *area, AZone *az, const ARegion *region) { + const int azonepad_edge = (0.1f * U.widget_unit); + /* If there is no visible region background, users typically expect the #AZone to be closer to * the content, so move it a bit. */ const int overlap_padding = @@ -1004,26 +1004,26 @@ static void region_azone_edge(const ScrArea *area, AZone *az, const ARegion *reg switch (az->edge) { case AE_TOP_TO_BOTTOMRIGHT: az->x1 = region->winrct.xmin; - az->y1 = region->winrct.ymax - AZONEPAD_EDGE - overlap_padding; + az->y1 = region->winrct.ymax - azonepad_edge - overlap_padding; az->x2 = region->winrct.xmax; - az->y2 = region->winrct.ymax + AZONEPAD_EDGE - overlap_padding; + az->y2 = region->winrct.ymax + azonepad_edge - overlap_padding; break; case AE_BOTTOM_TO_TOPLEFT: az->x1 = region->winrct.xmin; - az->y1 = region->winrct.ymin + AZONEPAD_EDGE + overlap_padding; + az->y1 = region->winrct.ymin + azonepad_edge + overlap_padding; az->x2 = region->winrct.xmax; - az->y2 = region->winrct.ymin - AZONEPAD_EDGE + overlap_padding; + az->y2 = region->winrct.ymin - azonepad_edge + overlap_padding; break; case AE_LEFT_TO_TOPRIGHT: - az->x1 = region->winrct.xmin - AZONEPAD_EDGE + overlap_padding; + az->x1 = region->winrct.xmin - azonepad_edge + overlap_padding; az->y1 = region->winrct.ymin; - az->x2 = region->winrct.xmin + AZONEPAD_EDGE + overlap_padding; + az->x2 = region->winrct.xmin + azonepad_edge + overlap_padding; az->y2 = region->winrct.ymax; break; case AE_RIGHT_TO_TOPLEFT: - az->x1 = region->winrct.xmax + AZONEPAD_EDGE - overlap_padding; + az->x1 = region->winrct.xmax + azonepad_edge - overlap_padding; az->y1 = region->winrct.ymin; - az->x2 = region->winrct.xmax - AZONEPAD_EDGE - overlap_padding; + az->x2 = region->winrct.xmax - azonepad_edge - overlap_padding; az->y2 = region->winrct.ymax; break; } diff --git a/source/blender/editors/space_sequencer/sequencer_timeline_draw.cc b/source/blender/editors/space_sequencer/sequencer_timeline_draw.cc index 9fc9d2f4dd2..73632591c68 100644 --- a/source/blender/editors/space_sequencer/sequencer_timeline_draw.cc +++ b/source/blender/editors/space_sequencer/sequencer_timeline_draw.cc @@ -75,7 +75,6 @@ #define SEQ_LEFTHANDLE 1 #define SEQ_RIGHTHANDLE 2 #define SEQ_HANDLE_SIZE 8.0f -#define SEQ_SCROLLER_TEXT_OFFSET 8 #define MUTE_ALPHA 120 struct StripDrawContext { diff --git a/source/blender/editors/space_text/text_intern.hh b/source/blender/editors/space_text/text_intern.hh index aa6abaa2376..9fd22f89ecf 100644 --- a/source/blender/editors/space_text/text_intern.hh +++ b/source/blender/editors/space_text/text_intern.hh @@ -59,8 +59,6 @@ void text_update_cursor_moved(bContext *C); #define SUGG_LIST_SIZE 7 #define SUGG_LIST_WIDTH 20 -#define DOC_WIDTH 40 -#define DOC_HEIGHT 10 #define TOOL_SUGG_LIST 0x01 diff --git a/source/blender/editors/transform/transform_data.hh b/source/blender/editors/transform/transform_data.hh index 75dab5e271e..70072374da1 100644 --- a/source/blender/editors/transform/transform_data.hh +++ b/source/blender/editors/transform/transform_data.hh @@ -168,7 +168,6 @@ enum { * need their keyframes tagged with this. */ TD_INTVALUES = 1 << 11, -#define TD_MIRROR_AXIS_SHIFT 12 /** For edit-mode mirror. */ TD_MIRROR_X = 1 << 12, TD_MIRROR_Y = 1 << 13, diff --git a/source/blender/makesdna/DNA_gpencil_legacy_types.h b/source/blender/makesdna/DNA_gpencil_legacy_types.h index 5002ef36e5c..dfb7a7ed6d1 100644 --- a/source/blender/makesdna/DNA_gpencil_legacy_types.h +++ b/source/blender/makesdna/DNA_gpencil_legacy_types.h @@ -29,8 +29,6 @@ struct MDeformVert; #define GPENCIL_MIN_FILL_FAC 0.05f #define GPENCIL_MAX_FILL_FAC 8.0f -#define GPENCIL_MAX_THICKNESS 5000 - /* ***************************************** */ /* GP Stroke Points */ @@ -889,8 +887,6 @@ typedef enum eGP_DrawMode { #define GPENCIL_SCULPT_MODE(gpd) ((gpd) && (gpd->flag & GP_DATA_STROKE_SCULPTMODE)) #define GPENCIL_WEIGHT_MODE(gpd) ((gpd) && (gpd->flag & GP_DATA_STROKE_WEIGHTMODE)) #define GPENCIL_VERTEX_MODE(gpd) ((gpd) && (gpd->flag & GP_DATA_STROKE_VERTEXMODE)) -#define GPENCIL_SCULPT_OR_WEIGHT_MODE(gpd) \ - ((gpd) && ((gpd)->flag & (GP_DATA_STROKE_SCULPTMODE | GP_DATA_STROKE_WEIGHTMODE))) #define GPENCIL_NONE_EDIT_MODE(gpd) \ ((gpd) && (((gpd)->flag & (GP_DATA_STROKE_EDITMODE | GP_DATA_STROKE_SCULPTMODE | \ GP_DATA_STROKE_WEIGHTMODE | GP_DATA_STROKE_VERTEXMODE)) == 0)) diff --git a/source/blender/makesdna/DNA_texture_types.h b/source/blender/makesdna/DNA_texture_types.h index 01f60963e01..484f2610ed4 100644 --- a/source/blender/makesdna/DNA_texture_types.h +++ b/source/blender/makesdna/DNA_texture_types.h @@ -378,10 +378,6 @@ enum { TEX_NO_CLAMP = 1 << 10, }; -#define TEX_FLAG_MASK \ - (TEX_COLORBAND | TEX_FLIPBLEND | TEX_NEGALPHA | TEX_CHECKER_ODD | TEX_CHECKER_EVEN | \ - TEX_PRV_ALPHA | TEX_PRV_NOR | TEX_REPEAT_XMIR | TEX_REPEAT_YMIR) - /** #Tex::extend (starts with 1 because of backward compatibility). */ enum { TEX_EXTEND = 1, diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index 90f53d4a652..02274b70b03 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -32,8 +32,6 @@ struct ColorBand; /* ************************ style definitions ******************** */ -#define MAX_STYLE_NAME 64 - /** * Default offered by Blender. * #uiFont.uifont_id @@ -90,7 +88,7 @@ typedef struct uiFontStyle { typedef struct uiStyle { struct uiStyle *next, *prev; - /** MAX_STYLE_NAME. */ + /** #MAX_NAME */ char name[64]; uiFontStyle paneltitle;