From 5dcb6fb22f3f0a8a5b2b9f0aa5479a29d635ddbe Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 20 Feb 2020 10:21:23 +1100 Subject: Cleanup: unused enums --- source/blender/blenkernel/BKE_DerivedMesh.h | 6 ------ source/blender/blenkernel/BKE_cloth.h | 2 +- source/blender/blenkernel/BKE_gpencil_modifier.h | 4 ++-- source/blender/blenkernel/BKE_lib_id.h | 2 +- source/blender/blenkernel/BKE_object.h | 3 ++- source/blender/blenkernel/BKE_packedFile.h | 1 - source/blender/blenkernel/BKE_sequencer.h | 4 ++-- 7 files changed, 8 insertions(+), 14 deletions(-) (limited to 'source/blender/blenkernel') diff --git a/source/blender/blenkernel/BKE_DerivedMesh.h b/source/blender/blenkernel/BKE_DerivedMesh.h index 28b027fe70e..a5226dfa947 100644 --- a/source/blender/blenkernel/BKE_DerivedMesh.h +++ b/source/blender/blenkernel/BKE_DerivedMesh.h @@ -101,12 +101,6 @@ typedef enum DerivedMeshType { DM_TYPE_CCGDM, } DerivedMeshType; -typedef enum DMForeachFlag { - DM_FOREACH_NOP = 0, - /* foreachMappedVert, foreachMappedLoop, foreachMappedFaceCenter */ - DM_FOREACH_USE_NORMAL = (1 << 0), -} DMForeachFlag; - typedef enum DMDirtyFlag { /* dm has valid tessellated faces, but tessellated CDDATA need to be updated. */ DM_DIRTY_TESS_CDLAYERS = 1 << 0, diff --git a/source/blender/blenkernel/BKE_cloth.h b/source/blender/blenkernel/BKE_cloth.h index 2862dda8ead..039104cf377 100644 --- a/source/blender/blenkernel/BKE_cloth.h +++ b/source/blender/blenkernel/BKE_cloth.h @@ -207,7 +207,7 @@ typedef enum { /** Require internal springs to be created between points with opposite normals. */ CLOTH_SIMSETTINGS_FLAG_INTERNAL_SPRINGS_NORMAL = (1 << 9), /** Edit cache in edit-mode. */ - CLOTH_SIMSETTINGS_FLAG_CCACHE_EDIT = (1 << 12), + /* CLOTH_SIMSETTINGS_FLAG_CCACHE_EDIT = (1 << 12), */ /* UNUSED */ /** Don't allow spring compression. */ CLOTH_SIMSETTINGS_FLAG_RESIST_SPRING_COMPRESS = (1 << 13), /** Pull ends of loose edges together. */ diff --git a/source/blender/blenkernel/BKE_gpencil_modifier.h b/source/blender/blenkernel/BKE_gpencil_modifier.h index 9cbc7d05ac2..89af1e510f6 100644 --- a/source/blender/blenkernel/BKE_gpencil_modifier.h +++ b/source/blender/blenkernel/BKE_gpencil_modifier.h @@ -51,7 +51,7 @@ typedef enum { } GpencilModifierTypeType; typedef enum { - eGpencilModifierTypeFlag_SupportsMapping = (1 << 0), + /* eGpencilModifierTypeFlag_SupportsMapping = (1 << 0), */ /* UNUSED */ eGpencilModifierTypeFlag_SupportsEditmode = (1 << 1), /** @@ -66,7 +66,7 @@ typedef enum { * For modifiers that require original data and so cannot * be placed after any non-deform modifier. */ - eGpencilModifierTypeFlag_RequiresOriginalData = (1 << 3), + /* eGpencilModifierTypeFlag_RequiresOriginalData = (1 << 3), */ /* UNUSED */ /** Max one per type. */ eGpencilModifierTypeFlag_Single = (1 << 4), diff --git a/source/blender/blenkernel/BKE_lib_id.h b/source/blender/blenkernel/BKE_lib_id.h index a911cd68e1e..d9d99d607c5 100644 --- a/source/blender/blenkernel/BKE_lib_id.h +++ b/source/blender/blenkernel/BKE_lib_id.h @@ -93,7 +93,7 @@ enum { /* *** Specific options to some ID types or usages. *** */ /* *** May be ignored by unrelated ID copying functions. *** */ /** Object only, needed by make_local code. */ - LIB_ID_COPY_NO_PROXY_CLEAR = 1 << 16, + /* LIB_ID_COPY_NO_PROXY_CLEAR = 1 << 16, */ /* UNUSED */ /** Do not copy preview data, when supported. */ LIB_ID_COPY_NO_PREVIEW = 1 << 17, /** Copy runtime data caches. */ diff --git a/source/blender/blenkernel/BKE_object.h b/source/blender/blenkernel/BKE_object.h index 4ea33d39385..9f436db97ee 100644 --- a/source/blender/blenkernel/BKE_object.h +++ b/source/blender/blenkernel/BKE_object.h @@ -370,7 +370,8 @@ typedef enum eObRelationTypes { OB_REL_CHILDREN = (1 << 2), /* immediate children */ OB_REL_CHILDREN_RECURSIVE = (1 << 3), /* All children */ OB_REL_MOD_ARMATURE = (1 << 4), /* Armatures related to the selected objects */ - OB_REL_SCENE_CAMERA = (1 << 5), /* you might want the scene camera too even if unselected? */ + /* OB_REL_SCENE_CAMERA = (1 << 5), */ /* you might want the scene camera too even if unselected? + */ } eObRelationTypes; typedef enum eObjectSet { diff --git a/source/blender/blenkernel/BKE_packedFile.h b/source/blender/blenkernel/BKE_packedFile.h index ab8d07d18e0..858e308a2b2 100644 --- a/source/blender/blenkernel/BKE_packedFile.h +++ b/source/blender/blenkernel/BKE_packedFile.h @@ -46,7 +46,6 @@ enum ePF_FileStatus { PF_USE_ORIGINAL = 6, PF_KEEP = 7, PF_REMOVE = 8, - PF_NOOP = 9, PF_ASK = 10, }; diff --git a/source/blender/blenkernel/BKE_sequencer.h b/source/blender/blenkernel/BKE_sequencer.h index 0057d6d8515..789d6b694cb 100644 --- a/source/blender/blenkernel/BKE_sequencer.h +++ b/source/blender/blenkernel/BKE_sequencer.h @@ -129,8 +129,8 @@ int BKE_sequencer_cmp_time_startdisp(const void *a, const void *b); enum { DO_SINGLE_WIPE, DO_DOUBLE_WIPE, - DO_BOX_WIPE, - DO_CROSS_WIPE, + /* DO_BOX_WIPE, */ /* UNUSED */ + /* DO_CROSS_WIPE, */ /* UNUSED */ DO_IRIS_WIPE, DO_CLOCK_WIPE, }; -- cgit v1.2.3