[Bf-blender-cvs] [5dcb6fb22f3] master: Cleanup: unused enums
Campbell Barton
noreply at git.blender.org
Thu Feb 20 02:25:45 CET 2020
Commit: 5dcb6fb22f3f0a8a5b2b9f0aa5479a29d635ddbe
Author: Campbell Barton
Date: Thu Feb 20 10:21:23 2020 +1100
Branches: master
https://developer.blender.org/rB5dcb6fb22f3f0a8a5b2b9f0aa5479a29d635ddbe
Cleanup: unused enums
===================================================================
M source/blender/blenkernel/BKE_DerivedMesh.h
M source/blender/blenkernel/BKE_cloth.h
M source/blender/blenkernel/BKE_gpencil_modifier.h
M source/blender/blenkernel/BKE_lib_id.h
M source/blender/blenkernel/BKE_object.h
M source/blender/blenkernel/BKE_packedFile.h
M source/blender/blenkernel/BKE_sequencer.h
M source/blender/blenlib/BLI_scanfill.h
M source/blender/blenloader/BLO_readfile.h
M source/blender/editors/include/ED_anim_api.h
M source/blender/editors/include/ED_screen.h
M source/blender/editors/include/UI_interface.h
M source/blender/makesdna/DNA_ID.h
M source/blender/makesdna/DNA_action_types.h
M source/blender/makesdna/DNA_anim_types.h
M source/blender/makesdna/DNA_boid_types.h
M source/blender/makesdna/DNA_cachefile_types.h
M source/blender/makesdna/DNA_collection_types.h
M source/blender/makesdna/DNA_constraint_types.h
M source/blender/makesdna/DNA_curveprofile_types.h
M source/blender/makesdna/DNA_customdata_types.h
M source/blender/makesdna/DNA_gpencil_types.h
M source/blender/makesdna/DNA_image_types.h
M source/blender/makesdna/DNA_layer_types.h
M source/blender/makesdna/DNA_modifier_types.h
M source/blender/makesdna/DNA_movieclip_types.h
M source/blender/makesdna/DNA_nla_types.h
M source/blender/makesdna/DNA_node_types.h
M source/blender/makesdna/DNA_object_fluidsim_types.h
M source/blender/makesdna/DNA_object_types.h
M source/blender/makesdna/DNA_particle_types.h
M source/blender/makesdna/DNA_rigidbody_types.h
M source/blender/makesdna/DNA_scene_types.h
M source/blender/makesdna/DNA_screen_types.h
M source/blender/makesdna/DNA_sound_types.h
M source/blender/makesdna/DNA_space_types.h
M source/blender/makesdna/DNA_userdef_types.h
M source/blender/makesrna/RNA_types.h
M source/blender/render/intern/include/render_types.h
M source/blender/windowmanager/wm_event_types.h
===================================================================
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,
};
diff --git a/source/blender/blenlib/BLI_scanfill.h b/source/blender/blenlib/BLI_scanfill.h
index 809c13a306f..39d3a679eb3 100644
--- a/source/blender/blenlib/BLI_scanfill.h
+++ b/source/blender/blenlib/BLI_scanfill.h
@@ -98,8 +98,6 @@ struct ScanFillEdge *BLI_scanfill_edge_add(ScanFillContext *sf_ctx,
struct ScanFillVert *v2);
enum {
- BLI_SCANFILL_CALC_QUADTRI_FASTPATH = (1 << 0),
-
/* note: using BLI_SCANFILL_CALC_REMOVE_DOUBLES
* Assumes ordered edges, otherwise we risk an eternal loop
* removing double verts. - campbell */
diff --git a/source/blender/blenloader/BLO_readfile.h b/source/blender/blenloader/BLO_readfile.h
index adf3bf00d48..ee7877b1a5d 100644
--- a/source/blender/blenloader/BLO_readfile.h
+++ b/source/blender/blenloader/BLO_readfile.h
@@ -48,8 +48,8 @@ typedef struct BlendHandle BlendHandle;
typedef enum eBlenFileType {
BLENFILETYPE_BLEND = 1,
- BLENFILETYPE_PUB = 2,
- BLENFILETYPE_RUNTIME = 3,
+ /* BLENFILETYPE_PUB = 2, */ /* UNUSED */
+ /* BLENFILETYPE_RUNTIME = 3, */ /* UNUSED */
} eBlenFileType;
typedef struct BlendFileData {
diff --git a/source/blender/editors/include/ED_anim_api.h b/source/blender/editors/include/ED_anim_api.h
index bf9b69f12e1..e2f10357f19 100644
--- a/source/blender/editors/include/ED_anim_api.h
+++ b/source/blender/editors/include/ED_anim_api.h
@@ -189,7 +189,7 @@ typedef struct bAnimListElem {
typedef enum eAnim_ChannelType {
ANIMTYPE_NONE = 0,
ANIMTYPE_ANIMDATA,
- ANIMTYPE_SPECIALDATA,
+ ANIMTYPE_SPECIALDATA__UNUSED,
ANIMTYPE_SUMMARY,
@@ -474,7 +474,7 @@ typedef enum eAnimChannel_Role {
/** datablock expander - a "composite" channel type */
ACHANNEL_ROLE_EXPANDER = -1,
/** special purposes - not generally for hierarchy processing */
- ACHANNEL_ROLE_SPECIAL = 0,
+ /* ACHANNEL_ROLE_SPECIAL = 0, */ /* UNUSED */
/** data channel - a channel representing one of the actual building blocks of channels */
ACHANNEL_ROLE_CHANNEL = 1,
} eAnimChannel_Role;
@@ -628,7 +628,7 @@ bool ANIM_remove_empty_action_from_animdata(struct AnimData *adt);
/* flags for Current Frame Drawing */
enum eAnimEditDraw_CurrentFrame {
/* plain time indicator with no special indicators */
- DRAWCFRA_PLAIN = 0,
+ /* DRAWCFRA_PLAIN = 0, */ /* UNUSED */
/* time indication in seconds or frames */
DRAWCFRA_UNIT_SECONDS = (1 << 0),
/* draw indicator extra wide (for timeline) */
@@ -729,7 +729,7 @@ typedef enum eAnimUnitConv_Flags {
ANIM_UNITCONV_ONLYSEL = (1 << 2),
/* only touch selected vertices */
ANIM_UNITCONV_SELVERTS = (1 << 3),
- ANIM_UNITCONV_SKIPKNOTS = (1 << 4),
+ /* ANIM_UNITCONV_SKIPKNOTS = (1 << 4), */ /* UNUSED */
/* Scale FCurve i a way it fits to -1..1 space */
ANIM_UNITCONV_NORMALIZE = (1 << 5),
/* Only when normalization is used: use scale factor from previous run,
diff --git a/source/blender/editors/include/ED_screen.h b/source/blender/editors/include/ED_screen.h
index ca083242ef2..1390567d5af 100644
--- a/source/blender/editors/include/ED_screen.h
+++ b/source/blender/editors/include/ED_screen.h
@@ -446,7 +446,6 @@ enum {
ED_KEYMAP_GIZMO = (1 << 2),
ED_KEYMAP_TOOL = (1 << 3),
ED_KEYMAP_VIEW2D = (1 << 4),
- ED_KEYMAP_MARKERS = (1 << 5),
ED_KEYMAP_ANIMATION = (1 << 6),
ED_KEYMAP_FRAMES = (1 << 7),
ED_KEYMAP_HEADER = (1 << 8),
diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h
index 8d84cf9deb6..74ecff22243 100644
--- a/source/blender/editors/include/UI_interface.h
+++ b/source/blender/editors/include/UI_interface.h
@@ -1736,7 +1736,7 @@ enum {
};
enum {
- UI_ITEM_O_RETURN_PROPS = 1 << 0,
+ /* UI_ITEM_O_RETURN_PROPS = 1 << 0, */ /* UNUSED */
UI_ITEM_R_EXPAND = 1 << 1,
UI_ITEM_R_SLIDER = 1 << 2,
/**
diff --git a/source/blender/makesdna/DNA_ID.h b/source/blender/makesdna/DNA_ID.h
index a75b01f2f75..d0ba2b0c4e5 100644
--- a/source/blender/makesdna/DNA_ID.h
+++ b/source/blender/makesdna/DNA_ID.h
@@ -112,24 +112,6 @@ enum {
IDP_STRING_SUB_BYTE = 1, /* arbitrary byte array, _not_ null terminated */
};
-/* IDP_GROUP */
-enum {
- /** Default. */
- IDP_GROUP_SUB_NONE = 0,
- /** Object mode settings. */
- IDP_GROUP_SUB_MODE_OBJECT = 1,
- /** Mesh edit mode settings. */
- IDP_GROUP_SUB_MODE_EDIT = 2,
- /** Render engine settings. */
- IDP_GROUP_SUB_ENGINE_RENDER = 3,
- /** Data override. */
- IDP_GROUP_SUB_OVERRIDE = 4,
- /** Weight paint mode settings. */
- IDP_GROUP_SUB_MODE_PAINT_WEIGHT = 5,
- /** Vertex paint mode settings. */
- IDP_GROUP_SUB_MODE_PAINT_VERTEX = 6,
-};
-
/*->flag*/
enum {
/** This IDProp may be statically overridden.
diff --git a/source/blender/makesdna/DNA_action_types.h b/source/blender/makesdna/DNA_action_types.h
index b95a4ca3d96..64a458cbbc5 100644
--- a/source/blender/makesdna/DNA_action_types.h
+++ b/source/blender/makesdna/DNA_action_types.h
@@ -158,13 +158,13 @@ typedef enum eMotionPaths_ViewFlag {
/* find keyframes in whole action (instead of just in matching group name) */
MOTIONPATH_VIEW_KFACT = (1 << 3),
/* draw lines on path */
- MOTIONPATH_VIEW_LINES = (1 << 4),
+ /* MOTIONPATH_VIEW_LINES = (1 << 4), */ /* UNUSED */
} eMotionPath_ViewFlag;
/* bAnimVizSettings->path_bakeflag */
typedef enum eMotionPaths_BakeFlag {
/** motion paths directly associated with this block of settings needs updating */
- MOTIONPATH_BAKE_NEEDS_RECALC = (1 << 0),
+ /* MOTIONPATH_BAKE_NEEDS_RECALC = (1 << 0), */ /* UNUSED */
/** for bones - calculate head-points for curves instead of tips */
MOTIONPATH_BAKE_HEADS = (1 << 1),
/** motion paths e
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list