diff options
Diffstat (limited to 'source/blender/editors')
28 files changed, 76 insertions, 75 deletions
diff --git a/source/blender/editors/animation/anim_channels_defines.c b/source/blender/editors/animation/anim_channels_defines.c index 1bddc6268b5..daa2cda2e1b 100644 --- a/source/blender/editors/animation/anim_channels_defines.c +++ b/source/blender/editors/animation/anim_channels_defines.c @@ -226,7 +226,7 @@ static void acf_gpencil_channel_color(bAnimContext *ac, bAnimListElem *ale, floa const bAnimChannelType *acf = ANIM_channel_get_typeinfo(ale); short indent = (acf->get_indent_level) ? acf->get_indent_level(ac, ale) : 0; bool showGroupColors = acf_show_channel_colors(ac); - + if ((showGroupColors) && (ale->type == ANIMTYPE_GPLAYER)) { bGPDlayer *gpl = (bGPDlayer *)ale->data; copy_v3_v3(r_color, gpl->color); @@ -530,7 +530,7 @@ static bAnimChannelType ACF_SUMMARY = acf_summary_setting_valid, /* has setting */ acf_summary_setting_flag, /* flag for setting */ - acf_summary_setting_ptr /* pointer for setting */ + acf_summary_setting_ptr, /* pointer for setting */ }; /* Scene ------------------------------------------- */ @@ -635,7 +635,7 @@ static bAnimChannelType ACF_SCENE = acf_scene_setting_valid, /* has setting */ acf_scene_setting_flag, /* flag for setting */ - acf_scene_setting_ptr /* pointer for setting */ + acf_scene_setting_ptr, /* pointer for setting */ }; /* Object ------------------------------------------- */ @@ -800,7 +800,7 @@ static bAnimChannelType ACF_OBJECT = acf_object_setting_valid, /* has setting */ acf_object_setting_flag, /* flag for setting */ - acf_object_setting_ptr /* pointer for setting */ + acf_object_setting_ptr, /* pointer for setting */ }; /* Group ------------------------------------------- */ @@ -959,7 +959,7 @@ static bAnimChannelType ACF_GROUP = acf_group_setting_valid, /* has setting */ acf_group_setting_flag, /* flag for setting */ - acf_group_setting_ptr /* pointer for setting */ + acf_group_setting_ptr, /* pointer for setting */ }; /* F-Curve ------------------------------------------- */ @@ -1076,7 +1076,7 @@ static bAnimChannelType ACF_FCURVE = acf_fcurve_setting_valid, /* has setting */ acf_fcurve_setting_flag, /* flag for setting */ - acf_fcurve_setting_ptr /* pointer for setting */ + acf_fcurve_setting_ptr, /* pointer for setting */ }; /* NLA Control FCurves Expander ----------------------- */ @@ -1175,7 +1175,7 @@ static bAnimChannelType ACF_NLACONTROLS = acf_nla_controls_setting_valid, /* has setting */ acf_nla_controls_setting_flag, /* flag for setting */ - acf_nla_controls_setting_ptr /* pointer for setting */ + acf_nla_controls_setting_ptr, /* pointer for setting */ }; @@ -1218,7 +1218,7 @@ static bAnimChannelType ACF_NLACURVE = acf_fcurve_setting_valid, /* has setting */ acf_fcurve_setting_flag, /* flag for setting */ - acf_fcurve_setting_ptr /* pointer for setting */ + acf_fcurve_setting_ptr, /* pointer for setting */ }; /* Object Action Expander ------------------------------------------- */ @@ -1303,7 +1303,7 @@ static bAnimChannelType ACF_FILLACTD = acf_fillactd_setting_valid, /* has setting */ acf_fillactd_setting_flag, /* flag for setting */ - acf_fillactd_setting_ptr /* pointer for setting */ + acf_fillactd_setting_ptr, /* pointer for setting */ }; /* Drivers Expander ------------------------------------------- */ @@ -1383,7 +1383,7 @@ static bAnimChannelType ACF_FILLDRIVERS = acf_filldrivers_setting_valid, /* has setting */ acf_filldrivers_setting_flag, /* flag for setting */ - acf_filldrivers_setting_ptr /* pointer for setting */ + acf_filldrivers_setting_ptr, /* pointer for setting */ }; @@ -1461,7 +1461,7 @@ static bAnimChannelType ACF_DSMAT = acf_generic_dataexpand_setting_valid, /* has setting */ acf_dsmat_setting_flag, /* flag for setting */ - acf_dsmat_setting_ptr /* pointer for setting */ + acf_dsmat_setting_ptr, /* pointer for setting */ }; /* Light Expander ------------------------------------------- */ @@ -1538,7 +1538,7 @@ static bAnimChannelType ACF_DSLIGHT = acf_generic_dataexpand_setting_valid, /* has setting */ acf_dslight_setting_flag, /* flag for setting */ - acf_dslight_setting_ptr /* pointer for setting */ + acf_dslight_setting_ptr, /* pointer for setting */ }; /* Texture Expander ------------------------------------------- */ @@ -1622,7 +1622,7 @@ static bAnimChannelType ACF_DSTEX = acf_generic_dataexpand_setting_valid, /* has setting */ acf_dstex_setting_flag, /* flag for setting */ - acf_dstex_setting_ptr /* pointer for setting */ + acf_dstex_setting_ptr, /* pointer for setting */ }; /* Camera Expander ------------------------------------------- */ @@ -1704,7 +1704,7 @@ static bAnimChannelType ACF_DSCACHEFILE = acf_generic_dataexpand_setting_valid, /* has setting */ acf_dscachefile_setting_flag, /* flag for setting */ - acf_dscachefile_setting_ptr /* pointer for setting */ + acf_dscachefile_setting_ptr, /* pointer for setting */ }; /* Camera Expander ------------------------------------------- */ @@ -1785,7 +1785,7 @@ static bAnimChannelType ACF_DSCAM = acf_generic_dataexpand_setting_valid, /* has setting */ acf_dscam_setting_flag, /* flag for setting */ - acf_dscam_setting_ptr /* pointer for setting */ + acf_dscam_setting_ptr, /* pointer for setting */ }; /* Curve Expander ------------------------------------------- */ @@ -1872,7 +1872,7 @@ static bAnimChannelType ACF_DSCUR = acf_generic_dataexpand_setting_valid, /* has setting */ acf_dscur_setting_flag, /* flag for setting */ - acf_dscur_setting_ptr /* pointer for setting */ + acf_dscur_setting_ptr, /* pointer for setting */ }; /* Shape Key Expander ------------------------------------------- */ @@ -1949,7 +1949,7 @@ static bAnimChannelType ACF_DSSKEY = acf_generic_dataexpand_setting_valid, /* has setting */ acf_dsskey_setting_flag, /* flag for setting */ - acf_dsskey_setting_ptr /* pointer for setting */ + acf_dsskey_setting_ptr, /* pointer for setting */ }; /* World Expander ------------------------------------------- */ @@ -2026,7 +2026,7 @@ static bAnimChannelType ACF_DSWOR = acf_generic_dataexpand_setting_valid, /* has setting */ acf_dswor_setting_flag, /* flag for setting */ - acf_dswor_setting_ptr /* pointer for setting */ + acf_dswor_setting_ptr, /* pointer for setting */ }; /* Particle Expander ------------------------------------------- */ @@ -2103,7 +2103,7 @@ static bAnimChannelType ACF_DSPART = acf_generic_dataexpand_setting_valid, /* has setting */ acf_dspart_setting_flag, /* flag for setting */ - acf_dspart_setting_ptr /* pointer for setting */ + acf_dspart_setting_ptr, /* pointer for setting */ }; /* MetaBall Expander ------------------------------------------- */ @@ -2180,7 +2180,7 @@ static bAnimChannelType ACF_DSMBALL = acf_generic_dataexpand_setting_valid, /* has setting */ acf_dsmball_setting_flag, /* flag for setting */ - acf_dsmball_setting_ptr /* pointer for setting */ + acf_dsmball_setting_ptr, /* pointer for setting */ }; /* Armature Expander ------------------------------------------- */ @@ -2257,7 +2257,7 @@ static bAnimChannelType ACF_DSARM = acf_generic_dataexpand_setting_valid, /* has setting */ acf_dsarm_setting_flag, /* flag for setting */ - acf_dsarm_setting_ptr /* pointer for setting */ + acf_dsarm_setting_ptr, /* pointer for setting */ }; /* NodeTree Expander ------------------------------------------- */ @@ -2345,7 +2345,7 @@ static bAnimChannelType ACF_DSNTREE = acf_generic_dataexpand_setting_valid, /* has setting */ acf_dsntree_setting_flag, /* flag for setting */ - acf_dsntree_setting_ptr /* pointer for setting */ + acf_dsntree_setting_ptr, /* pointer for setting */ }; /* LineStyle Expander ------------------------------------------- */ @@ -2422,7 +2422,7 @@ static bAnimChannelType ACF_DSLINESTYLE = acf_generic_dataexpand_setting_valid, /* has setting */ acf_dslinestyle_setting_flag, /* flag for setting */ - acf_dslinestyle_setting_ptr /* pointer for setting */ + acf_dslinestyle_setting_ptr, /* pointer for setting */ }; /* Mesh Expander ------------------------------------------- */ @@ -2499,7 +2499,7 @@ static bAnimChannelType ACF_DSMESH = acf_generic_dataexpand_setting_valid, /* has setting */ acf_dsmesh_setting_flag, /* flag for setting */ - acf_dsmesh_setting_ptr /* pointer for setting */ + acf_dsmesh_setting_ptr, /* pointer for setting */ }; /* Lattice Expander ------------------------------------------- */ @@ -2576,7 +2576,7 @@ static bAnimChannelType ACF_DSLAT = acf_generic_dataexpand_setting_valid, /* has setting */ acf_dslat_setting_flag, /* flag for setting */ - acf_dslat_setting_ptr /* pointer for setting */ + acf_dslat_setting_ptr, /* pointer for setting */ }; /* Speaker Expander ------------------------------------------- */ @@ -2653,7 +2653,7 @@ static bAnimChannelType ACF_DSSPK = acf_generic_dataexpand_setting_valid, /* has setting */ acf_dsspk_setting_flag, /* flag for setting */ - acf_dsspk_setting_ptr /* pointer for setting */ + acf_dsspk_setting_ptr, /* pointer for setting */ }; /* GPencil Expander ------------------------------------------- */ @@ -2730,7 +2730,7 @@ static bAnimChannelType ACF_DSGPENCIL = acf_generic_dataexpand_setting_valid, /* has setting */ acf_dsgpencil_setting_flag, /* flag for setting */ - acf_dsgpencil_setting_ptr /* pointer for setting */ + acf_dsgpencil_setting_ptr, /* pointer for setting */ }; /* World Expander ------------------------------------------- */ @@ -2808,7 +2808,7 @@ static bAnimChannelType ACF_DSMCLIP = acf_generic_dataexpand_setting_valid, /* has setting */ acf_dsmclip_setting_flag, /* flag for setting */ - acf_dsmclip_setting_ptr /* pointer for setting */ + acf_dsmclip_setting_ptr, /* pointer for setting */ }; /* ShapeKey Entry ------------------------------------------- */ @@ -2916,7 +2916,7 @@ static bAnimChannelType ACF_SHAPEKEY = acf_shapekey_setting_valid, /* has setting */ acf_shapekey_setting_flag, /* flag for setting */ - acf_shapekey_setting_ptr /* pointer for setting */ + acf_shapekey_setting_ptr, /* pointer for setting */ }; /* GPencil Datablock ------------------------------------------- */ @@ -2993,7 +2993,7 @@ static bAnimChannelType ACF_GPD = acf_gpd_setting_valid, /* has setting */ acf_gpd_setting_flag, /* flag for setting */ - acf_gpd_setting_ptr /* pointer for setting */ + acf_gpd_setting_ptr, /* pointer for setting */ }; /* GPencil Layer ------------------------------------------- */ @@ -3086,7 +3086,7 @@ static bAnimChannelType ACF_GPL = acf_gpl_setting_valid, /* has setting */ acf_gpl_setting_flag, /* flag for setting */ - acf_gpl_setting_ptr /* pointer for setting */ + acf_gpl_setting_ptr, /* pointer for setting */ }; @@ -3164,7 +3164,7 @@ static bAnimChannelType ACF_MASKDATA = acf_mask_setting_valid, /* has setting */ acf_mask_setting_flag, /* flag for setting */ - acf_mask_setting_ptr /* pointer for setting */ + acf_mask_setting_ptr, /* pointer for setting */ }; /* Mask Layer ------------------------------------------- */ @@ -3251,7 +3251,7 @@ static bAnimChannelType ACF_MASKLAYER = acf_masklay_setting_valid, /* has setting */ acf_masklay_setting_flag, /* flag for setting */ - acf_masklay_setting_ptr /* pointer for setting */ + acf_masklay_setting_ptr, /* pointer for setting */ }; /* NLA Track ----------------------------------------------- */ @@ -3390,7 +3390,7 @@ static bAnimChannelType ACF_NLATRACK = acf_nlatrack_setting_valid, /* has setting */ acf_nlatrack_setting_flag, /* flag for setting */ - acf_nlatrack_setting_ptr /* pointer for setting */ + acf_nlatrack_setting_ptr, /* pointer for setting */ }; /* NLA Action ----------------------------------------------- */ @@ -3556,7 +3556,7 @@ static bAnimChannelType ACF_NLAACTION = acf_nlaaction_setting_valid, /* has setting */ acf_nlaaction_setting_flag, /* flag for setting */ - acf_nlaaction_setting_ptr /* pointer for setting */ + acf_nlaaction_setting_ptr, /* pointer for setting */ }; diff --git a/source/blender/editors/animation/keyframing.c b/source/blender/editors/animation/keyframing.c index bc630040fdd..793a73e6939 100644 --- a/source/blender/editors/animation/keyframing.c +++ b/source/blender/editors/animation/keyframing.c @@ -564,7 +564,7 @@ enum { KEYNEEDED_DONTADD = 0, KEYNEEDED_JUSTADD, KEYNEEDED_DELPREV, - KEYNEEDED_DELNEXT + KEYNEEDED_DELNEXT, } /*eKeyNeededStatus*/; /* This helper function determines whether a new keyframe is needed */ diff --git a/source/blender/editors/armature/pose_slide.c b/source/blender/editors/armature/pose_slide.c index e6ed26bdf71..90de331b3e0 100644 --- a/source/blender/editors/armature/pose_slide.c +++ b/source/blender/editors/armature/pose_slide.c @@ -147,7 +147,7 @@ typedef enum ePoseSlide_Channels { PS_TFM_BBONE_SHAPE, /* Bendy Bones */ - PS_TFM_PROPS /* Custom Properties */ + PS_TFM_PROPS, /* Custom Properties */ } ePoseSlide_Channels; /* Property enum for ePoseSlide_Channels */ @@ -1344,7 +1344,7 @@ typedef enum ePosePropagate_Termination { /* only do on keyframes that are selected */ POSE_PROPAGATE_SELECTED_KEYS, /* only do on the frames where markers are selected */ - POSE_PROPAGATE_SELECTED_MARKERS + POSE_PROPAGATE_SELECTED_MARKERS, } ePosePropagate_Termination; /* termination data needed for some modes - assumes only one of these entries will be needed at a time */ diff --git a/source/blender/editors/gpencil/annotate_paint.c b/source/blender/editors/gpencil/annotate_paint.c index dcecd87a862..bfbf319b1c6 100644 --- a/source/blender/editors/gpencil/annotate_paint.c +++ b/source/blender/editors/gpencil/annotate_paint.c @@ -93,7 +93,7 @@ typedef enum eGP_StrokeAdd_Result { GP_STROKEADD_INVALID = -2, /* error occurred - insufficient info to do so */ GP_STROKEADD_OVERFLOW = -1, /* error occurred - cannot fit any more points */ GP_STROKEADD_NORMAL, /* point was successfully added */ - GP_STROKEADD_FULL /* cannot add any more points to buffer */ + GP_STROKEADD_FULL, /* cannot add any more points to buffer */ } eGP_StrokeAdd_Result; /* Runtime flags */ diff --git a/source/blender/editors/gpencil/gpencil_intern.h b/source/blender/editors/gpencil/gpencil_intern.h index d4736a4fdab..3742ca92551 100644 --- a/source/blender/editors/gpencil/gpencil_intern.h +++ b/source/blender/editors/gpencil/gpencil_intern.h @@ -356,7 +356,7 @@ typedef enum eGPencil_PaintModes { GP_PAINTMODE_ERASER, GP_PAINTMODE_DRAW_STRAIGHT, GP_PAINTMODE_DRAW_POLY, - GP_PAINTMODE_SET_CP + GP_PAINTMODE_SET_CP, } eGPencil_PaintModes; /* maximum sizes of gp-session buffer */ @@ -548,7 +548,7 @@ typedef enum ACTFILTER_FLAGS { ACTFILTER_IPOKEYS = (1 << 4), /* only channels referencing ipo's */ ACTFILTER_ONLYICU = (1 << 5), /* only reference ipo-curves */ ACTFILTER_FORDRAWING = (1 << 6), /* make list for interface drawing */ - ACTFILTER_ACTGROUPED = (1 << 7) /* belongs to the active group */ + ACTFILTER_ACTGROUPED = (1 << 7), /* belongs to the active group */ } ACTFILTER_FLAGS; /* Action Editor - Main Data types */ @@ -556,7 +556,7 @@ typedef enum ACTCONT_TYPES { ACTCONT_NONE = 0, ACTCONT_ACTION, ACTCONT_SHAPEKEY, - ACTCONT_GPENCIL + ACTCONT_GPENCIL, } ACTCONT_TYPES; /* ****************************************************** */ diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c index aadaff5b7cc..8ac4d602736 100644 --- a/source/blender/editors/gpencil/gpencil_paint.c +++ b/source/blender/editors/gpencil/gpencil_paint.c @@ -93,7 +93,7 @@ typedef enum eGPencil_PaintStatus { GP_STATUS_IDLING = 0, /* stroke isn't in progress yet */ GP_STATUS_PAINTING, /* a stroke is in progress */ GP_STATUS_ERROR, /* something wasn't correctly set up */ - GP_STATUS_DONE /* painting done */ + GP_STATUS_DONE, /* painting done */ } eGPencil_PaintStatus; /* Return flags for adding points to stroke buffer */ @@ -101,7 +101,7 @@ typedef enum eGP_StrokeAdd_Result { GP_STROKEADD_INVALID = -2, /* error occurred - insufficient info to do so */ GP_STROKEADD_OVERFLOW = -1, /* error occurred - cannot fit any more points */ GP_STROKEADD_NORMAL, /* point was successfully added */ - GP_STROKEADD_FULL /* cannot add any more points to buffer */ + GP_STROKEADD_FULL, /* cannot add any more points to buffer */ } eGP_StrokeAdd_Result; /* Runtime flags */ diff --git a/source/blender/editors/include/ED_anim_api.h b/source/blender/editors/include/ED_anim_api.h index a9dce0a0542..dc5ffb4794d 100644 --- a/source/blender/editors/include/ED_anim_api.h +++ b/source/blender/editors/include/ED_anim_api.h @@ -240,7 +240,7 @@ typedef enum eAnim_ChannelType { ANIMTYPE_PALETTE, /* always as last item, the total number of channel types... */ - ANIMTYPE_NUM_TYPES + ANIMTYPE_NUM_TYPES, } eAnim_ChannelType; /* types of keyframe data in bAnimListElem */ @@ -255,7 +255,7 @@ typedef enum eAnim_KeyType { ALE_SCE, /* Scene summary */ ALE_OB, /* Object summary */ ALE_ACT, /* Action summary */ - ALE_GROUP /* Action Group summary */ + ALE_GROUP, /* Action Group summary */ } eAnim_KeyType; /* Flags for specifying the types of updates (i.e. recalculation/refreshing) that diff --git a/source/blender/editors/include/ED_fileselect.h b/source/blender/editors/include/ED_fileselect.h index 000af75a9cb..48c38396e98 100644 --- a/source/blender/editors/include/ED_fileselect.h +++ b/source/blender/editors/include/ED_fileselect.h @@ -121,7 +121,7 @@ typedef enum FSMenuCategory { FS_CATEGORY_SYSTEM, FS_CATEGORY_SYSTEM_BOOKMARKS, FS_CATEGORY_BOOKMARKS, - FS_CATEGORY_RECENT + FS_CATEGORY_RECENT, } FSMenuCategory; typedef enum FSMenuInsert { diff --git a/source/blender/editors/include/ED_keyframes_draw.h b/source/blender/editors/include/ED_keyframes_draw.h index 475484104a1..5c97dc835d1 100644 --- a/source/blender/editors/include/ED_keyframes_draw.h +++ b/source/blender/editors/include/ED_keyframes_draw.h @@ -104,7 +104,7 @@ typedef enum eKeyframeShapeDrawOpts { /* only the inside filling */ KEYFRAME_SHAPE_INSIDE, /* the whole thing */ - KEYFRAME_SHAPE_BOTH + KEYFRAME_SHAPE_BOTH, } eKeyframeShapeDrawOpts; /* Handle type. */ diff --git a/source/blender/editors/include/ED_keyframes_edit.h b/source/blender/editors/include/ED_keyframes_edit.h index 402dc3e67bc..266eb3850b3 100644 --- a/source/blender/editors/include/ED_keyframes_edit.h +++ b/source/blender/editors/include/ED_keyframes_edit.h @@ -72,7 +72,7 @@ typedef enum eEditKeyframes_Select { /* "selection map" building modes */ typedef enum eEditKeyframes_SelMap { SELMAP_MORE = 0, - SELMAP_LESS + SELMAP_LESS, } eEditKeyframes_SelMap; /* snapping tools */ @@ -199,7 +199,7 @@ typedef enum eKeyPasteOffset { /* paste keys relative to the current frame when copying */ KEYFRAME_PASTE_OFFSET_CFRA_RELATIVE, /* paste keys from original time */ - KEYFRAME_PASTE_OFFSET_NONE + KEYFRAME_PASTE_OFFSET_NONE, } eKeyPasteOffset; typedef enum eKeyMergeMode { @@ -210,7 +210,7 @@ typedef enum eKeyMergeMode { /* overwrite keys in pasted range */ KEYFRAME_PASTE_MERGE_OVER_RANGE, /* overwrite keys in pasted range (use all keyframe start & end for range) */ - KEYFRAME_PASTE_MERGE_OVER_RANGE_ALL + KEYFRAME_PASTE_MERGE_OVER_RANGE_ALL, } eKeyMergeMode; /* ---------------- Looping API --------------------- */ diff --git a/source/blender/editors/include/ED_screen_types.h b/source/blender/editors/include/ED_screen_types.h index 762fba29947..46b8a9b34de 100644 --- a/source/blender/editors/include/ED_screen_types.h +++ b/source/blender/editors/include/ED_screen_types.h @@ -81,7 +81,7 @@ typedef enum { AE_TOP_TO_BOTTOMRIGHT, /** Region located at the top, _bottom_ edge is action zone. * Region minimized to the top left */ - AE_BOTTOM_TO_TOPLEFT + AE_BOTTOM_TO_TOPLEFT, } AZEdge; typedef enum { diff --git a/source/blender/editors/include/ED_transverts.h b/source/blender/editors/include/ED_transverts.h index 95b74a2108f..d03cd0151a6 100644 --- a/source/blender/editors/include/ED_transverts.h +++ b/source/blender/editors/include/ED_transverts.h @@ -49,7 +49,7 @@ bool ED_transverts_poll(struct bContext *C); enum { TM_INDEX_ON = 1, /* tag to make trans verts */ TM_INDEX_OFF = 0, /* don't make verts */ - TM_INDEX_SKIP = -1 /* dont make verts (when the index values point to trans-verts) */ + TM_INDEX_SKIP = -1, /* dont make verts (when the index values point to trans-verts) */ }; /* mode flags: */ diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h index 4a3e0983989..b862f36337c 100644 --- a/source/blender/editors/include/UI_interface.h +++ b/source/blender/editors/include/UI_interface.h @@ -292,7 +292,7 @@ typedef enum { UI_BUT_POIN_INT = 96, UI_BUT_POIN_FLOAT = 128, /* UI_BUT_POIN_FUNCTION = 192, */ /*UNUSED*/ - UI_BUT_POIN_BIT = 256 /* OR'd with a bit index*/ + UI_BUT_POIN_BIT = 256, /* OR'd with a bit index*/ } eButPointerType; /* requires (but->poin != NULL) */ diff --git a/source/blender/editors/include/UI_resources.h b/source/blender/editors/include/UI_resources.h index ae2f0269a9c..61fc09b751b 100644 --- a/source/blender/editors/include/UI_resources.h +++ b/source/blender/editors/include/UI_resources.h @@ -35,7 +35,7 @@ typedef enum { /* ui */ #include "UI_icons.h" - BIFICONID_LAST + BIFICONID_LAST, } BIFIconID; #define BIFICONID_FIRST (ICON_NONE) @@ -310,7 +310,7 @@ typedef enum ThemeColorID { TH_METADATA_TEXT, TH_EDGE_BEVEL, - TH_VERTEX_BEVEL + TH_VERTEX_BEVEL, } ThemeColorID; /* specific defines per space should have higher define values */ diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index 07be2253969..86a225bf3bd 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -133,7 +133,7 @@ typedef enum uiButtonActivateType { BUTTON_ACTIVATE, BUTTON_ACTIVATE_APPLY, BUTTON_ACTIVATE_TEXT_EDITING, - BUTTON_ACTIVATE_OPEN + BUTTON_ACTIVATE_OPEN, } uiButtonActivateType; typedef enum uiHandleButtonState { @@ -147,7 +147,7 @@ typedef enum uiHandleButtonState { BUTTON_STATE_TEXT_SELECTING, BUTTON_STATE_MENU_OPEN, BUTTON_STATE_WAIT_DRAG, - BUTTON_STATE_EXIT + BUTTON_STATE_EXIT, } uiHandleButtonState; diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c index 6c4389aabd9..fbfa2d11e45 100644 --- a/source/blender/editors/interface/interface_layout.c +++ b/source/blender/editors/interface/interface_layout.c @@ -118,7 +118,7 @@ typedef enum uiItemType { TEMPLATE_BOX, TEMPLATE_HEADER, - TEMPLATE_HEADER_ID + TEMPLATE_HEADER_ID, #endif } uiItemType; diff --git a/source/blender/editors/interface/interface_panel.c b/source/blender/editors/interface/interface_panel.c index c34992ceb9c..b44b666a050 100644 --- a/source/blender/editors/interface/interface_panel.c +++ b/source/blender/editors/interface/interface_panel.c @@ -90,7 +90,7 @@ typedef enum uiHandlePanelState { PANEL_STATE_DRAG_SCALE, PANEL_STATE_WAIT_UNTAB, PANEL_STATE_ANIMATION, - PANEL_STATE_EXIT + PANEL_STATE_EXIT, } uiHandlePanelState; typedef struct uiHandlePanelData { diff --git a/source/blender/editors/interface/view2d_ops.c b/source/blender/editors/interface/view2d_ops.c index 790b92a357e..62d434584fe 100644 --- a/source/blender/editors/interface/view2d_ops.c +++ b/source/blender/editors/interface/view2d_ops.c @@ -1698,7 +1698,7 @@ enum { SCROLLHANDLE_BAR, SCROLLHANDLE_MAX, SCROLLHANDLE_MIN_OUTSIDE, - SCROLLHANDLE_MAX_OUTSIDE + SCROLLHANDLE_MAX_OUTSIDE, } /*eV2DScrollerHandle_Zone*/; /* ------------------------ */ diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c index 1944d2989ac..9576cbe6fa1 100644 --- a/source/blender/editors/object/object_modifier.c +++ b/source/blender/editors/object/object_modifier.c @@ -1610,7 +1610,7 @@ void OBJECT_OT_skin_root_mark(wmOperatorType *ot) typedef enum { SKIN_LOOSE_MARK, - SKIN_LOOSE_CLEAR + SKIN_LOOSE_CLEAR, } SkinLooseAction; static int skin_loose_mark_clear_exec(bContext *C, wmOperator *op) diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c index 4a48d308631..a9b00e7bbdd 100644 --- a/source/blender/editors/object/object_relations.c +++ b/source/blender/editors/object/object_relations.c @@ -440,7 +440,7 @@ void OBJECT_OT_proxy_make(wmOperatorType *ot) typedef enum eObClearParentTypes { CLEAR_PARENT_ALL = 0, CLEAR_PARENT_KEEP_TRANSFORM, - CLEAR_PARENT_INVERSE + CLEAR_PARENT_INVERSE, } eObClearParentTypes; EnumPropertyItem prop_clear_parent_types[] = { diff --git a/source/blender/editors/sculpt_paint/paint_image.c b/source/blender/editors/sculpt_paint/paint_image.c index 91b37442301..237e60cd5e0 100644 --- a/source/blender/editors/sculpt_paint/paint_image.c +++ b/source/blender/editors/sculpt_paint/paint_image.c @@ -315,7 +315,7 @@ static bool image_paint_2d_clone_poll(bContext *C) /************************ paint operator ************************/ typedef enum eTexPaintMode { PAINT_MODE_2D, - PAINT_MODE_3D_PROJECT + PAINT_MODE_3D_PROJECT, } eTexPaintMode; typedef struct PaintOperation { diff --git a/source/blender/editors/sculpt_paint/paint_intern.h b/source/blender/editors/sculpt_paint/paint_intern.h index 5b86fc02979..0e8262bd82f 100644 --- a/source/blender/editors/sculpt_paint/paint_intern.h +++ b/source/blender/editors/sculpt_paint/paint_intern.h @@ -297,21 +297,21 @@ void flip_qt_qt(float out[3], const float in[3], const char symm); typedef enum BrushStrokeMode { BRUSH_STROKE_NORMAL, BRUSH_STROKE_INVERT, - BRUSH_STROKE_SMOOTH + BRUSH_STROKE_SMOOTH, } BrushStrokeMode; /* paint_hide.c */ typedef enum { PARTIALVIS_HIDE, - PARTIALVIS_SHOW + PARTIALVIS_SHOW, } PartialVisAction; typedef enum { PARTIALVIS_INSIDE, PARTIALVIS_OUTSIDE, PARTIALVIS_ALL, - PARTIALVIS_MASKED + PARTIALVIS_MASKED, } PartialVisArea; void PAINT_OT_hide_show(struct wmOperatorType *ot); @@ -321,7 +321,7 @@ void PAINT_OT_hide_show(struct wmOperatorType *ot); typedef enum { PAINT_MASK_FLOOD_VALUE, PAINT_MASK_FLOOD_VALUE_INVERSE, - PAINT_MASK_INVERT + PAINT_MASK_INVERT, } PaintMaskFloodMode; void PAINT_OT_mask_flood_fill(struct wmOperatorType *ot); diff --git a/source/blender/editors/sculpt_paint/paint_ops.c b/source/blender/editors/sculpt_paint/paint_ops.c index e26b30fbf45..218d3ce4273 100644 --- a/source/blender/editors/sculpt_paint/paint_ops.c +++ b/source/blender/editors/sculpt_paint/paint_ops.c @@ -550,7 +550,7 @@ static void BRUSH_OT_uv_sculpt_tool_set(wmOperatorType *ot) typedef enum { STENCIL_TRANSLATE, STENCIL_SCALE, - STENCIL_ROTATE + STENCIL_ROTATE, } StencilControlMode; typedef enum { diff --git a/source/blender/editors/space_graph/graph_select.c b/source/blender/editors/space_graph/graph_select.c index 681e46e9daf..6c6c0d451cc 100644 --- a/source/blender/editors/space_graph/graph_select.c +++ b/source/blender/editors/space_graph/graph_select.c @@ -1094,7 +1094,7 @@ typedef struct tNearestVertInfo { typedef enum eGraphVertIndex { NEAREST_HANDLE_LEFT = -1, NEAREST_HANDLE_KEY, - NEAREST_HANDLE_RIGHT + NEAREST_HANDLE_RIGHT, } eGraphVertIndex; /* Tolerance for absolute radius (in pixels) of the vert from the cursor to use */ diff --git a/source/blender/editors/space_node/node_group.c b/source/blender/editors/space_node/node_group.c index 3de389dca7c..e38d29454dc 100644 --- a/source/blender/editors/space_node/node_group.c +++ b/source/blender/editors/space_node/node_group.c @@ -527,7 +527,7 @@ static int node_group_separate_selected( typedef enum eNodeGroupSeparateType { NODE_GS_COPY, - NODE_GS_MOVE + NODE_GS_MOVE, } eNodeGroupSeparateType; /* Operator Property */ diff --git a/source/blender/editors/space_outliner/outliner_tools.c b/source/blender/editors/space_outliner/outliner_tools.c index 15d2d007ecf..083ae3a048c 100644 --- a/source/blender/editors/space_outliner/outliner_tools.c +++ b/source/blender/editors/space_outliner/outliner_tools.c @@ -651,13 +651,13 @@ typedef enum eOutliner_PropDataOps { typedef enum eOutliner_PropConstraintOps { OL_CONSTRAINTOP_ENABLE = 1, OL_CONSTRAINTOP_DISABLE, - OL_CONSTRAINTOP_DELETE + OL_CONSTRAINTOP_DELETE, } eOutliner_PropConstraintOps; typedef enum eOutliner_PropModifierOps { OL_MODIFIER_OP_TOGVIS = 1, OL_MODIFIER_OP_TOGREN, - OL_MODIFIER_OP_DELETE + OL_MODIFIER_OP_DELETE, } eOutliner_PropModifierOps; static void pchan_cb(int event, TreeElement *te, TreeStoreElem *UNUSED(tselem), void *UNUSED(arg)) @@ -1188,7 +1188,7 @@ typedef enum eOutlinerIdOpTypes { OUTLINER_IDOP_FAKE_CLEAR, OUTLINER_IDOP_RENAME, - OUTLINER_IDOP_SELECT_LINKED + OUTLINER_IDOP_SELECT_LINKED, } eOutlinerIdOpTypes; // TODO: implement support for changing the ID-block used diff --git a/source/blender/editors/space_sequencer/sequencer_select.c b/source/blender/editors/space_sequencer/sequencer_select.c index 7742d74d559..6de20e3c4af 100644 --- a/source/blender/editors/space_sequencer/sequencer_select.c +++ b/source/blender/editors/space_sequencer/sequencer_select.c @@ -209,6 +209,7 @@ static void select_neighbor_from_last(Scene *scene, int lr) } } if (changed) { + /* pass */ } } #endif diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index 4c53e9dbd4e..1358b526bca 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -1667,7 +1667,7 @@ typedef enum { UP, DOWN, LEFT, - RIGHT + RIGHT, } ArrowDirection; #define POS_INDEX 0 |