diff options
-rw-r--r-- | source/blender/blenlib/tests/BLI_array_store_test.cc | 11 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_removedoubles.c | 1 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_object_types.h | 2 | ||||
-rw-r--r-- | source/blender/windowmanager/WM_types.h | 9 |
4 files changed, 4 insertions, 19 deletions
diff --git a/source/blender/blenlib/tests/BLI_array_store_test.cc b/source/blender/blenlib/tests/BLI_array_store_test.cc index 8bbd109fb81..89aeccdc105 100644 --- a/source/blender/blenlib/tests/BLI_array_store_test.cc +++ b/source/blender/blenlib/tests/BLI_array_store_test.cc @@ -187,17 +187,6 @@ static void testbuffer_list_state_from_data__stride_expand(ListBase *lb, ((void)0) /* test in both directions */ -#define TESTBUFFER_STRINGS_EX(bs, ...) \ - { \ - ListBase lb; \ - TESTBUFFER_STRINGS_CREATE(&lb, __VA_ARGS__); \ -\ - testbuffer_run_tests(bs, &lb); \ -\ - testbuffer_list_free(&lb); \ - } \ - ((void)0) - #define TESTBUFFER_STRINGS(stride, chunk_count, ...) \ { \ ListBase lb; \ diff --git a/source/blender/bmesh/operators/bmo_removedoubles.c b/source/blender/bmesh/operators/bmo_removedoubles.c index 8cc0bfadbda..57760900d45 100644 --- a/source/blender/bmesh/operators/bmo_removedoubles.c +++ b/source/blender/bmesh/operators/bmo_removedoubles.c @@ -327,7 +327,6 @@ void bmo_weld_verts_exec(BMesh *bm, BMOperator *op) } #define VERT_KEEP 8 -#define VERT_IN 32 #define EDGE_MARK 1 diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index c6d6334118f..0250d853898 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -467,8 +467,6 @@ typedef struct ObHook { /* used many places, should be specialized. */ #define SELECT 1 -#define OBJECT_ACTIVE_MODIFIER_NONE -1 - /* type */ enum { OB_EMPTY = 0, diff --git a/source/blender/windowmanager/WM_types.h b/source/blender/windowmanager/WM_types.h index 485d8e5a162..843ceca7700 100644 --- a/source/blender/windowmanager/WM_types.h +++ b/source/blender/windowmanager/WM_types.h @@ -328,11 +328,10 @@ typedef struct wmNotifier { #define ND_LAYOUTDELETE (2 << 16) #define ND_ANIMPLAY (4 << 16) #define ND_GPENCIL (5 << 16) -#define ND_EDITOR_CHANGED (6 << 16) /* Sent to new editors after switching to them. */ -#define ND_LAYOUTSET (7 << 16) -#define ND_SKETCH (8 << 16) -#define ND_WORKSPACE_SET (9 << 16) -#define ND_WORKSPACE_DELETE (10 << 16) +#define ND_LAYOUTSET (6 << 16) +#define ND_SKETCH (7 << 16) +#define ND_WORKSPACE_SET (8 << 16) +#define ND_WORKSPACE_DELETE (9 << 16) /* NC_SCENE Scene */ #define ND_SCENEBROWSE (1 << 16) |