diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-01-15 15:57:49 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-01-15 16:03:03 +0300 |
commit | 88a80fcec8672b5bb67041456dc7f7101aae3d55 (patch) | |
tree | e1b93fd997bba2e0481395bb51b51058eb9aa990 /source/blender/makesdna | |
parent | 2d98dce7ee29b7e5d685ee5de9aa1e4eebe46a01 (diff) |
Cleanup: commas at the end of enums
Without this clang-format may wrap them onto a single line.
Diffstat (limited to 'source/blender/makesdna')
29 files changed, 169 insertions, 169 deletions
diff --git a/source/blender/makesdna/DNA_action_types.h b/source/blender/makesdna/DNA_action_types.h index c9c86e13202..807dbe5be25 100644 --- a/source/blender/makesdna/DNA_action_types.h +++ b/source/blender/makesdna/DNA_action_types.h @@ -106,7 +106,7 @@ typedef enum eMotionPath_Flag { /* Custom colors */ MOTIONPATH_FLAG_CUSTOM = (1 << 2), /* Draw lines or only points */ - MOTIONPATH_FLAG_LINES = (1 << 3) + MOTIONPATH_FLAG_LINES = (1 << 3), } eMotionPath_Flag; /* Visualization General --------------------------- */ @@ -153,7 +153,7 @@ typedef struct bAnimVizSettings { /* bAnimVizSettings->recalc */ typedef enum eAnimViz_RecalcFlags { /* motionpaths need recalculating */ - ANIMVIZ_RECALC_PATHS = (1 << 0) + ANIMVIZ_RECALC_PATHS = (1 << 0), } eAnimViz_RecalcFlags; @@ -166,13 +166,13 @@ typedef enum eOnionSkin_Types { /* show ghosts within the specified frame range */ GHOST_TYPE_RANGE = 2, /* show ghosts on keyframes within the specified range only */ - GHOST_TYPE_KEYS = 3 + GHOST_TYPE_KEYS = 3, } eOnionSkin_Types; /* bAnimVizSettings->ghost_flag */ typedef enum eOnionSkin_Flag { /* only show selected bones in ghosts */ - GHOST_FLAG_ONLYSEL = (1 << 0) + GHOST_FLAG_ONLYSEL = (1 << 0), } eOnionSkin_Flag; @@ -195,7 +195,7 @@ 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), } eMotionPath_ViewFlag; /* bAnimVizSettings->path_bakeflag */ @@ -206,7 +206,7 @@ typedef enum eMotionPaths_BakeFlag { MOTIONPATH_BAKE_HEADS = (1 << 1), /** motion paths exist for AnimVizSettings instance - set when calc for first time, * and unset when clearing */ - MOTIONPATH_BAKE_HAS_PATHS = (1 << 2) + MOTIONPATH_BAKE_HAS_PATHS = (1 << 2), } eMotionPath_BakeFlag; /* runtime */ @@ -406,7 +406,7 @@ typedef enum ePchan_Flag { POSE_HAS_IKS = (1 << 14), #endif /* spline IK solving */ - POSE_IKSPLINE = (1 << 15) + POSE_IKSPLINE = (1 << 15), } ePchan_Flag; /* PoseChannel constflag (constraint detection) */ @@ -419,7 +419,7 @@ typedef enum ePchan_ConstFlag { /* only for drawing Posemode too */ PCHAN_HAS_STRIDE = (1 << 4), /* spline IK */ - PCHAN_HAS_SPLINEIK = (1 << 5) + PCHAN_HAS_SPLINEIK = (1 << 5), } ePchan_ConstFlag; /* PoseChannel->ikflag */ @@ -437,7 +437,7 @@ typedef enum ePchan_IkFlag { BONE_IK_NO_XDOF_TEMP = (1 << 10), BONE_IK_NO_YDOF_TEMP = (1 << 11), - BONE_IK_NO_ZDOF_TEMP = (1 << 12) + BONE_IK_NO_ZDOF_TEMP = (1 << 12), } ePchan_IkFlag; /* PoseChannel->drawflag */ @@ -480,7 +480,7 @@ typedef enum eRotationModes { ROT_MODE_AXISANGLE = -1, ROT_MODE_MIN = ROT_MODE_AXISANGLE, /* sentinel for Py API */ - ROT_MODE_MAX = ROT_MODE_ZYX + ROT_MODE_MAX = ROT_MODE_ZYX, } eRotationModes; /* Pose ------------------------------------ */ @@ -557,7 +557,7 @@ typedef enum ePose_Flags { /* bPose->iksolver and bPose->ikparam->iksolver */ typedef enum ePose_IKSolverType { IKSOLVER_STANDARD = 0, - IKSOLVER_ITASC = 1 + IKSOLVER_ITASC = 1, } ePose_IKSolverType; /* header for all bPose->ikparam structures */ @@ -589,7 +589,7 @@ typedef enum eItasc_Flags { ITASC_AUTO_STEP = (1 << 0), ITASC_INITIAL_REITERATION = (1 << 1), ITASC_REITERATION = (1 << 2), - ITASC_SIMULATION = (1 << 3) + ITASC_SIMULATION = (1 << 3), } eItasc_Flags; /* bItasc->solver */ @@ -662,7 +662,7 @@ typedef enum eActionGroup_Flag { AGRP_MODIFIERS_OFF = (1 << 7), AGRP_TEMP = (1 << 30), - AGRP_MOVED = (1u << 31) + AGRP_MOVED = (1u << 31), } eActionGroup_Flag; @@ -714,7 +714,7 @@ typedef enum eAction_Flags { /* flags for evaluation/editing */ ACT_MUTED = (1 << 9), ACT_PROTECTED = (1 << 10), - ACT_DISABLED = (1 << 11) + ACT_DISABLED = (1 << 11), } eAction_Flags; @@ -800,7 +800,7 @@ typedef enum eDopeSheet_FilterFlag { ADS_FILTER_GP_3DONLY = (1 << 29), /** combination filters (some only used at runtime) */ - ADS_FILTER_NOOBDATA = (ADS_FILTER_NOCAM | ADS_FILTER_NOMAT | ADS_FILTER_NOLAM | ADS_FILTER_NOCUR | ADS_FILTER_NOPART | ADS_FILTER_NOARM | ADS_FILTER_NOSPK | ADS_FILTER_NOMODIFIERS) + ADS_FILTER_NOOBDATA = (ADS_FILTER_NOCAM | ADS_FILTER_NOMAT | ADS_FILTER_NOLAM | ADS_FILTER_NOCUR | ADS_FILTER_NOPART | ADS_FILTER_NOARM | ADS_FILTER_NOSPK | ADS_FILTER_NOMODIFIERS), } eDopeSheet_FilterFlag; /* DopeSheet general flags */ @@ -929,7 +929,7 @@ typedef enum eAnimEdit_AutoSnap { /* snap to actual seconds (nla-action time) */ SACTSNAP_SECOND = 4, /* snap to 1.0 second increments */ - SACTSNAP_TSTEP = 5 + SACTSNAP_TSTEP = 5, } eAnimEdit_AutoSnap; /* SAction->cache_display */ @@ -985,7 +985,7 @@ typedef enum eActionChannelFlag { ACHAN_EXPANDED = (1 << 4), ACHAN_SHOWIPO = (1 << 5), ACHAN_SHOWCONS = (1 << 6), - ACHAN_MOVED = (1u << 31) + ACHAN_MOVED = (1u << 31), } eActionChannelFlag; #endif /* __DNA_ACTION_TYPES_H__ */ diff --git a/source/blender/makesdna/DNA_anim_types.h b/source/blender/makesdna/DNA_anim_types.h index cd9d0ab472e..4fb0a19dfc8 100644 --- a/source/blender/makesdna/DNA_anim_types.h +++ b/source/blender/makesdna/DNA_anim_types.h @@ -112,7 +112,7 @@ typedef enum eFModifier_Flags { /* restrict range that F-Modifier can be considered over */ FMODIFIER_FLAG_RANGERESTRICT = (1<<4), /* use influence control */ - FMODIFIER_FLAG_USEINFLUENCE = (1<<5) + FMODIFIER_FLAG_USEINFLUENCE = (1<<5), } eFModifier_Flags; /* --- */ @@ -138,7 +138,7 @@ typedef struct FMod_Generator { /* generator modes */ typedef enum eFMod_Generator_Modes { FCM_GENERATOR_POLYNOMIAL = 0, - FCM_GENERATOR_POLYNOMIAL_FACTORISED = 1 + FCM_GENERATOR_POLYNOMIAL_FACTORISED = 1, } eFMod_Generator_Modes; @@ -147,7 +147,7 @@ typedef enum eFMod_Generator_Modes { */ typedef enum eFMod_Generator_Flags { /* generator works in conjunction with other modifiers (i.e. doesn't replace those before it) */ - FCM_GENERATOR_ADDITIVE = (1<<0) + FCM_GENERATOR_ADDITIVE = (1<<0), } eFMod_Generator_Flags; @@ -181,7 +181,7 @@ typedef enum eFMod_Generator_Functions { FCM_GENERATOR_FN_TAN = 2, FCM_GENERATOR_FN_SQRT = 3, FCM_GENERATOR_FN_LN = 4, - FCM_GENERATOR_FN_SINC = 5 + FCM_GENERATOR_FN_SINC = 5, } eFMod_Generator_Functions; @@ -261,7 +261,7 @@ typedef enum eFMod_Limit_Flags { FCM_LIMIT_XMIN = (1<<0), FCM_LIMIT_XMAX = (1<<1), FCM_LIMIT_YMIN = (1<<2), - FCM_LIMIT_YMAX = (1<<3) + FCM_LIMIT_YMAX = (1<<3), } eFMod_Limit_Flags; @@ -628,7 +628,7 @@ typedef enum eFCurve_Flags { FCURVE_DISCRETE_VALUES = (1<<12), /** temporary tag for editing */ - FCURVE_TAGGED = (1<<15) + FCURVE_TAGGED = (1<<15), } eFCurve_Flags; /* extrapolation modes (only simple value 'extending') */ @@ -745,7 +745,7 @@ typedef enum eNlaStrip_Extrapolate_Mode { /* only hold+extend last frame */ NLASTRIP_EXTEND_HOLD_FORWARD = 1, /* don't contribute at all */ - NLASTRIP_EXTEND_NOTHING = 2 + NLASTRIP_EXTEND_NOTHING = 2, } eNlaStrip_Extrapolate_Mode; /* NLA Strip Settings */ @@ -786,7 +786,7 @@ typedef enum eNlaStrip_Flag { NLASTRIP_FLAG_NO_TIME_MAP = (1<<29), /* NLA-Strip is really just a temporary meta used to facilitate easier transform code */ NLASTRIP_FLAG_TEMP_META = (1<<30), - NLASTRIP_FLAG_EDIT_TOUCHED = (1u << 31) + NLASTRIP_FLAG_EDIT_TOUCHED = (1u << 31), } eNlaStrip_Flag; /* NLA Strip Type */ @@ -843,7 +843,7 @@ typedef enum eNlaTrack_Flag { /** track is not allowed to execute, * usually as result of tweaking being enabled (internal flag) */ - NLATRACK_DISABLED = (1<<10) + NLATRACK_DISABLED = (1<<10), } eNlaTrack_Flag; @@ -888,7 +888,7 @@ typedef struct KS_Path { /* KS_Path->flag */ typedef enum eKSP_Settings { /* entire array (not just the specified index) gets keyframed */ - KSP_FLAG_WHOLE_ARRAY = (1<<0) + KSP_FLAG_WHOLE_ARRAY = (1<<0), } eKSP_Settings; /* KS_Path->groupmode */ @@ -951,7 +951,7 @@ typedef enum eKS_Settings { /* keyingset cannot be removed (and doesn't need to be freed) */ KEYINGSET_BUILTIN = (1<<0), /* keyingset does not depend on context info (i.e. paths are absolute) */ - KEYINGSET_ABSOLUTE = (1<<1) + KEYINGSET_ABSOLUTE = (1<<1), } eKS_Settings; /* Flags for use by keyframe creation/deletion calls */ @@ -1104,7 +1104,7 @@ typedef enum eAnimData_Flag { typedef enum eAnimData_Recalc { ADT_RECALC_DRIVERS = (1 << 0), ADT_RECALC_ANIM = (1 << 1), - ADT_RECALC_ALL = (ADT_RECALC_DRIVERS | ADT_RECALC_ANIM) + ADT_RECALC_ALL = (ADT_RECALC_DRIVERS | ADT_RECALC_ANIM), } eAnimData_Recalc; /* Base Struct for Anim ------------------------------------- */ diff --git a/source/blender/makesdna/DNA_armature_types.h b/source/blender/makesdna/DNA_armature_types.h index aa4f1280915..c5c548f04fd 100644 --- a/source/blender/makesdna/DNA_armature_types.h +++ b/source/blender/makesdna/DNA_armature_types.h @@ -184,13 +184,13 @@ typedef enum eArmature_Drawtype { ARM_LINE = 1, ARM_B_BONE = 2, ARM_ENVELOPE = 3, - ARM_WIRE = 4 + ARM_WIRE = 4, } eArmature_Drawtype; /* armature->gevertdeformer */ typedef enum eArmature_VertDeformer { ARM_VDEF_BLENDER = 0, - ARM_VDEF_BGE_CPU = 1 + ARM_VDEF_BGE_CPU = 1, } eArmature_VertDeformer; /* armature->deformflag */ @@ -201,7 +201,7 @@ typedef enum eArmature_DeformFlag { #ifdef DNA_DEPRECATED ARM_DEF_B_BONE_REST = (1<<3), /* deprecated */ #endif - ARM_DEF_INVERT_VGROUP = (1<<4) + ARM_DEF_INVERT_VGROUP = (1<<4), } eArmature_DeformFlag; /* armature->pathflag */ @@ -212,7 +212,7 @@ typedef enum eArmature_PathFlag { ARM_PATH_KFRAS = (1<<1), ARM_PATH_HEADS = (1<<2), ARM_PATH_ACFRA = (1<<3), - ARM_PATH_KFNOS = (1<<4) + ARM_PATH_KFNOS = (1<<4), } eArmature_PathFlag; #endif @@ -221,7 +221,7 @@ typedef enum eArmature_PathFlag { typedef enum eArmature_GhostType { ARM_GHOST_CUR = 0, ARM_GHOST_RANGE = 1, - ARM_GHOST_KEYS = 2 + ARM_GHOST_KEYS = 2, } eArmature_GhostType; /* bone->flag */ @@ -271,7 +271,7 @@ typedef enum eBone_Flag { /** object child will use relative transform (like deform) */ BONE_RELATIVE_PARENTING = (1 << 23), /** it will add the parent end roll to the inroll */ - BONE_ADD_PARENT_END_ROLL = (1 << 24) + BONE_ADD_PARENT_END_ROLL = (1 << 24), } eBone_Flag; diff --git a/source/blender/makesdna/DNA_brush_types.h b/source/blender/makesdna/DNA_brush_types.h index 3c91e8be8b7..c980fa79d40 100644 --- a/source/blender/makesdna/DNA_brush_types.h +++ b/source/blender/makesdna/DNA_brush_types.h @@ -182,7 +182,7 @@ typedef enum eGP_BrushIcons { GP_BRUSH_ICON_FILL = 7, GP_BRUSH_ICON_ERASE_SOFT = 8, GP_BRUSH_ICON_ERASE_HARD = 9, - GP_BRUSH_ICON_ERASE_STROKE = 10 + GP_BRUSH_ICON_ERASE_STROKE = 10, } eGP_BrushIcons; typedef struct Brush { @@ -389,12 +389,12 @@ typedef enum eBrushFlags { BRUSH_CUSTOM_ICON = (1 << 28), BRUSH_LINE = (1 << 29), BRUSH_ABSOLUTE_JITTER = (1 << 30), - BRUSH_CURVE = (1u << 31) + BRUSH_CURVE = (1u << 31), } eBrushFlags; typedef enum { BRUSH_MASK_PRESSURE_RAMP = (1 << 1), - BRUSH_MASK_PRESSURE_CUTOFF = (1 << 2) + BRUSH_MASK_PRESSURE_CUTOFF = (1 << 2), } BrushMaskPressureFlags; /* Brush.overlay_flags */ @@ -404,7 +404,7 @@ typedef enum eOverlayFlags { BRUSH_OVERLAY_SECONDARY = (1 << 2), BRUSH_OVERLAY_CURSOR_OVERRIDE_ON_STROKE = (1 << 3), BRUSH_OVERLAY_PRIMARY_OVERRIDE_ON_STROKE = (1 << 4), - BRUSH_OVERLAY_SECONDARY_OVERRIDE_ON_STROKE = (1 << 5) + BRUSH_OVERLAY_SECONDARY_OVERRIDE_ON_STROKE = (1 << 5), } eOverlayFlags; #define BRUSH_OVERLAY_OVERRIDE_MASK (BRUSH_OVERLAY_CURSOR_OVERRIDE_ON_STROKE | \ @@ -431,7 +431,7 @@ typedef enum eBrushSculptTool { SCULPT_TOOL_CREASE = 16, SCULPT_TOOL_BLOB = 17, SCULPT_TOOL_CLAY_STRIPS = 18, - SCULPT_TOOL_MASK = 19 + SCULPT_TOOL_MASK = 19, } eBrushSculptTool; /** When #BRUSH_ACCUMULATE is used */ @@ -476,7 +476,7 @@ typedef enum eBrushImagePaintTool { PAINT_TOOL_SMEAR = 2, PAINT_TOOL_CLONE = 3, PAINT_TOOL_FILL = 4, - PAINT_TOOL_MASK = 5 + PAINT_TOOL_MASK = 5, } eBrushImagePaintTool; typedef enum eBrushVertexPaintTool { @@ -507,12 +507,12 @@ enum { SCULPT_DISP_DIR_VIEW = 1, SCULPT_DISP_DIR_X = 2, SCULPT_DISP_DIR_Y = 3, - SCULPT_DISP_DIR_Z = 4 + SCULPT_DISP_DIR_Z = 4, }; typedef enum { BRUSH_MASK_DRAW = 0, - BRUSH_MASK_SMOOTH = 1 + BRUSH_MASK_SMOOTH = 1, } BrushMaskTool; /* blur kernel types, Brush.blur_mode */ diff --git a/source/blender/makesdna/DNA_color_types.h b/source/blender/makesdna/DNA_color_types.h index 5a78b72419f..ff9c1040c4f 100644 --- a/source/blender/makesdna/DNA_color_types.h +++ b/source/blender/makesdna/DNA_color_types.h @@ -133,12 +133,12 @@ enum { HISTO_MODE_R = 2, HISTO_MODE_G = 3, HISTO_MODE_B = 4, - HISTO_MODE_ALPHA = 5 + HISTO_MODE_ALPHA = 5, }; enum { HISTO_FLAG_LINE = (1 << 0), - HISTO_FLAG_SAMPLELINE = (1 << 1) + HISTO_FLAG_SAMPLELINE = (1 << 1), }; typedef struct Histogram { @@ -216,7 +216,7 @@ typedef struct ColorManagedColorspaceSettings { /* ColorManagedViewSettings->flag */ enum { - COLORMANAGE_VIEW_USE_CURVES = (1 << 0) + COLORMANAGE_VIEW_USE_CURVES = (1 << 0), }; #endif diff --git a/source/blender/makesdna/DNA_constraint_types.h b/source/blender/makesdna/DNA_constraint_types.h index a5bd0890200..c8e55cc15a1 100644 --- a/source/blender/makesdna/DNA_constraint_types.h +++ b/source/blender/makesdna/DNA_constraint_types.h @@ -122,7 +122,7 @@ typedef struct bConstraintTarget { /* bConstraintTarget -> flag */ typedef enum eConstraintTargetFlag { /** temporary target-struct that needs to be freed after use */ - CONSTRAINT_TAR_TEMP = (1<<0) + CONSTRAINT_TAR_TEMP = (1<<0), } eConstraintTargetFlag; /* bConstraintTarget/bConstraintOb -> type */ @@ -134,7 +134,7 @@ typedef enum eConstraintObType { /** string is vertex-group name */ CONSTRAINT_OBTYPE_VERT = 3, /** string is vertex-group name - is not available until curves get vgroups */ - CONSTRAINT_OBTYPE_CV = 4 + CONSTRAINT_OBTYPE_CV = 4, } eConstraintObType; @@ -209,7 +209,7 @@ typedef enum eConstraint_IK_Type { /** 'standard' IK constraint: match position and/or orientation of target */ CONSTRAINT_IK_COPYPOSE = 0, /** maintain distance with target */ - CONSTRAINT_IK_DISTANCE = 1 + CONSTRAINT_IK_DISTANCE = 1, } eConstraint_IK_Type; @@ -719,7 +719,7 @@ typedef enum eBConstraint_SpaceTypes { // XXX deprecated... old AnimSys typedef enum eConstraintChannel_Flags { CONSTRAINT_CHANNEL_SELECT = (1<<0), - CONSTRAINT_CHANNEL_PROTECTED = (1<<1) + CONSTRAINT_CHANNEL_PROTECTED = (1<<1), } eConstraintChannel_Flags; /* -------------------------------------- */ @@ -732,7 +732,7 @@ typedef enum eCopyRotation_Flags { ROTLIKE_X_INVERT = (1<<4), ROTLIKE_Y_INVERT = (1<<5), ROTLIKE_Z_INVERT = (1<<6), - ROTLIKE_OFFSET = (1<<7) + ROTLIKE_OFFSET = (1<<7), } eCopyRotation_Flags; /* bLocateLikeConstraint.flag */ @@ -745,7 +745,7 @@ typedef enum eCopyLocation_Flags { LOCLIKE_X_INVERT = (1<<4), LOCLIKE_Y_INVERT = (1<<5), LOCLIKE_Z_INVERT = (1<<6), - LOCLIKE_OFFSET = (1<<7) + LOCLIKE_OFFSET = (1<<7), } eCopyLocation_Flags; /* bSizeLikeConstraint.flag */ @@ -768,7 +768,7 @@ typedef enum eTransform_ToFrom { typedef enum eSameVolume_Modes { SAMEVOL_X = 0, SAMEVOL_Y = 1, - SAMEVOL_Z = 2 + SAMEVOL_Z = 2, } eSameVolume_Modes; /* bActionConstraint.flag */ @@ -781,14 +781,14 @@ typedef enum eActionConstraint_Flags { typedef enum eLockAxis_Modes { LOCK_X = 0, LOCK_Y = 1, - LOCK_Z = 2 + LOCK_Z = 2, } eLockAxis_Modes; /* Up-Axis Values (TrackTo and Locked Track) */ typedef enum eUpAxis_Modes { UP_X = 0, UP_Y = 1, - UP_Z = 2 + UP_Z = 2, } eUpAxis_Modes; /* Tracking axis (TrackTo, Locked Track, Damped Track) and minmax (floor) constraint */ @@ -822,12 +822,12 @@ typedef enum eShrinkwrap_Flags { typedef enum eFollowPath_Flags { FOLLOWPATH_FOLLOW = (1<<0), FOLLOWPATH_STATIC = (1<<1), - FOLLOWPATH_RADIUS = (1<<2) + FOLLOWPATH_RADIUS = (1<<2), } eFollowPath_Flags; /* bTrackToConstraint->flags */ typedef enum eTrackTo_Flags { - TARGET_Z_UP = (1<<0) + TARGET_Z_UP = (1<<0), } eTrackTo_Flags; /* Stretch To Constraint -> volmode */ @@ -835,14 +835,14 @@ typedef enum eStretchTo_VolMode { VOLUME_XZ = 0, VOLUME_X = 1, VOLUME_Z = 2, - NO_VOLUME = 3 + NO_VOLUME = 3, } eStretchTo_VolMode; /* Stretch To Constraint -> plane mode */ typedef enum eStretchTo_PlaneMode { PLANE_X = 0, PLANE_Y = 1, - PLANE_Z = 2 + PLANE_Z = 2, } eStretchTo_PlaneMode; /* Clamp-To Constraint ->flag */ @@ -850,12 +850,12 @@ typedef enum eClampTo_Modes { CLAMPTO_AUTO = 0, CLAMPTO_X = 1, CLAMPTO_Y = 2, - CLAMPTO_Z = 3 + CLAMPTO_Z = 3, } eClampTo_Modes; /* ClampTo Constraint ->flag2 */ typedef enum eClampTo_Flags { - CLAMPTO_CYCLIC = (1<<0) + CLAMPTO_CYCLIC = (1<<0), } eClampTo_Flags; /* bKinematicConstraint->flag */ @@ -878,7 +878,7 @@ typedef enum eKinematic_Flags { CONSTRAINT_IK_NO_ROT_Y = (1<<12), CONSTRAINT_IK_NO_ROT_Z = (1<<13), /* axis relative to target */ - CONSTRAINT_IK_TARGETAXIS = (1<<14) + CONSTRAINT_IK_TARGETAXIS = (1<<14), } eKinematic_Flags; /* bSplineIKConstraint->flag */ @@ -908,7 +908,7 @@ typedef enum eSplineIK_XZScaleModes { /* x/z scales are the inverse of the y-scale */ CONSTRAINT_SPLINEIK_XZS_INVERSE = 2, /* x/z scales are computed using a volume preserving technique (from Stretch To constraint) */ - CONSTRAINT_SPLINEIK_XZS_VOLUMETRIC = 3 + CONSTRAINT_SPLINEIK_XZS_VOLUMETRIC = 3, } eSplineIK_XZScaleModes; /* bArmatureConstraint -> flag */ @@ -925,7 +925,7 @@ typedef enum eArmature_Flags { typedef enum eFloor_Flags { MINMAX_STICKY = (1<<0), MINMAX_STUCK = (1<<1), - MINMAX_USEROT = (1<<2) + MINMAX_USEROT = (1<<2), } eFloor_Flags; /* transform limiting constraints -> flag2 */ @@ -933,7 +933,7 @@ typedef enum eTransformLimits_Flags2 { /* not used anymore - for older Limit Location constraints only */ LIMIT_NOPARENT = (1<<0), /* for all Limit constraints - allow to be used during transform? */ - LIMIT_TRANSFORM = (1<<1) + LIMIT_TRANSFORM = (1<<1), } eTransformLimits_Flags2; /* transform limiting constraints -> flag (own flags) */ @@ -943,14 +943,14 @@ typedef enum eTransformLimits_Flags { LIMIT_YMIN = (1<<2), LIMIT_YMAX = (1<<3), LIMIT_ZMIN = (1<<4), - LIMIT_ZMAX = (1<<5) + LIMIT_ZMAX = (1<<5), } eTransformLimits_Flags; /* limit rotation constraint -> flag (own flags) */ typedef enum eRotLimit_Flags { LIMIT_XROT = (1<<0), LIMIT_YROT = (1<<1), - LIMIT_ZROT = (1<<2) + LIMIT_ZROT = (1<<2), } eRotLimit_Flags; /* distance limit constraint */ @@ -959,20 +959,20 @@ typedef enum eDistLimit_Flag { /* "soft" cushion effect when reaching the limit sphere */ // NOT IMPLEMENTED! LIMITDIST_USESOFT = (1<<0), /* as for all Limit constraints - allow to be used during transform? */ - LIMITDIST_TRANSFORM = (1<<1) + LIMITDIST_TRANSFORM = (1<<1), } eDistLimit_Flag; /* bDistLimitConstraint->mode */ typedef enum eDistLimit_Modes { LIMITDIST_INSIDE = 0, LIMITDIST_OUTSIDE = 1, - LIMITDIST_ONSURFACE = 2 + LIMITDIST_ONSURFACE = 2, } eDistLimit_Modes; /* python constraint -> flag */ typedef enum ePyConstraint_Flags { PYCON_USETARGETS = (1<<0), - PYCON_SCRIPTERROR = (1<<1) + PYCON_SCRIPTERROR = (1<<1), } ePyConstraint_Flags; /* ChildOf Constraint -> flag */ @@ -986,7 +986,7 @@ typedef enum eChildOf_Flags { CHILDOF_SIZEX = (1<<6), CHILDOF_SIZEY = (1<<7), CHILDOF_SIZEZ = (1<<8), - CHILDOF_ALL = 511 + CHILDOF_ALL = 511, } eChildOf_Flags; /* Pivot Constraint */ @@ -1007,7 +1007,7 @@ typedef enum ePivotConstraint_Axis { /* consider +ve y-axis rotations */ PIVOTCON_AXIS_Y = 4, /* consider +ve z-axis rotations */ - PIVOTCON_AXIS_Z = 5 + PIVOTCON_AXIS_Z = 5, } ePivotConstraint_Axis; /* settings for Pivot Constraint in general */ @@ -1015,29 +1015,29 @@ typedef enum ePivotConstraint_Flag { /* offset is to be interpreted as being a fixed-point in space */ PIVOTCON_FLAG_OFFSET_ABS = (1<<0), /* rotation-based activation uses negative rotation to drive result */ - PIVOTCON_FLAG_ROTACT_NEG = (1<<1) + PIVOTCON_FLAG_ROTACT_NEG = (1<<1), } ePivotConstraint_Flag; typedef enum eFollowTrack_Flags { FOLLOWTRACK_ACTIVECLIP = (1<<0), FOLLOWTRACK_USE_3D_POSITION = (1<<1), - FOLLOWTRACK_USE_UNDISTORTION = (1<<2) + FOLLOWTRACK_USE_UNDISTORTION = (1<<2), } eFollowTrack_Flags; typedef enum eFollowTrack_FrameMethod { FOLLOWTRACK_FRAME_STRETCH = 0, FOLLOWTRACK_FRAME_FIT = 1, - FOLLOWTRACK_FRAME_CROP = 2 + FOLLOWTRACK_FRAME_CROP = 2, } eFollowTrack_FrameMethod; /* CameraSolver Constraint -> flag */ typedef enum eCameraSolver_Flags { - CAMERASOLVER_ACTIVECLIP = (1<<0) + CAMERASOLVER_ACTIVECLIP = (1<<0), } eCameraSolver_Flags; /* ObjectSolver Constraint -> flag */ typedef enum eObjectSolver_Flags { - OBJECTSOLVER_ACTIVECLIP = (1<<0) + OBJECTSOLVER_ACTIVECLIP = (1<<0), } eObjectSolver_Flags; /* ObjectSolver Constraint -> flag */ diff --git a/source/blender/makesdna/DNA_curve_types.h b/source/blender/makesdna/DNA_curve_types.h index b080cbd9a64..3437c1a4a4d 100644 --- a/source/blender/makesdna/DNA_curve_types.h +++ b/source/blender/makesdna/DNA_curve_types.h @@ -446,7 +446,7 @@ typedef enum eBezTriple_Handle { /* f5 (beztriple) */ typedef enum eBezTriple_Auto_Type { HD_AUTOTYPE_NORMAL = 0, - HD_AUTOTYPE_SPECIAL = 1 + HD_AUTOTYPE_SPECIAL = 1, } eBezTriple_Auto_Type; /* interpolation modes (used only for BezTriple->ipo) */ diff --git a/source/blender/makesdna/DNA_customdata_types.h b/source/blender/makesdna/DNA_customdata_types.h index 7085dafbf72..2793f82af09 100644 --- a/source/blender/makesdna/DNA_customdata_types.h +++ b/source/blender/makesdna/DNA_customdata_types.h @@ -149,7 +149,7 @@ typedef enum CustomDataType { CD_TESSLOOPNORMAL = 40, CD_CUSTOMLOOPNORMAL = 41, - CD_NUMTYPES = 42 + CD_NUMTYPES = 42, } CustomDataType; /* Bits for CustomDataMask */ diff --git a/source/blender/makesdna/DNA_genfile.h b/source/blender/makesdna/DNA_genfile.h index 4f14d5c0174..c9b53698d80 100644 --- a/source/blender/makesdna/DNA_genfile.h +++ b/source/blender/makesdna/DNA_genfile.h @@ -65,7 +65,7 @@ typedef enum eSDNA_Type { /* define so switch statements don't complain */ #define SDNA_TYPE_VOID 9 SDNA_TYPE_INT64 = 10, - SDNA_TYPE_UINT64 = 11 + SDNA_TYPE_UINT64 = 11, } eSDNA_Type; /** diff --git a/source/blender/makesdna/DNA_gpencil_modifier_types.h b/source/blender/makesdna/DNA_gpencil_modifier_types.h index 35873efd730..aaafc897739 100644 --- a/source/blender/makesdna/DNA_gpencil_modifier_types.h +++ b/source/blender/makesdna/DNA_gpencil_modifier_types.h @@ -194,14 +194,14 @@ typedef enum eTimeGpencil_Flag { typedef enum eTimeGpencil_Mode { GP_TIME_MODE_NORMAL = 0, GP_TIME_MODE_REVERSE = 1, - GP_TIME_MODE_FIX = 2 + GP_TIME_MODE_FIX = 2, } eTimeGpencil_Mode; typedef enum eModifyColorGpencil_Flag { GP_MODIFY_COLOR_BOTH = 0, GP_MODIFY_COLOR_STROKE = 1, - GP_MODIFY_COLOR_FILL = 2 + GP_MODIFY_COLOR_FILL = 2, } eModifyColorGpencil_Flag; typedef struct TintGpencilModifierData { diff --git a/source/blender/makesdna/DNA_gpencil_types.h b/source/blender/makesdna/DNA_gpencil_types.h index 2f85549cc5e..93a375bf1dc 100644 --- a/source/blender/makesdna/DNA_gpencil_types.h +++ b/source/blender/makesdna/DNA_gpencil_types.h @@ -136,7 +136,7 @@ typedef enum eGPDpalettecolor_Flag { /* do onion skinning */ PC_COLOR_ONIONSKIN = (1 << 3), /* "volumetric" strokes */ - PC_COLOR_VOLUMETRIC = (1 << 4) + PC_COLOR_VOLUMETRIC = (1 << 4), } eGPDpalettecolor_Flag; /* palette of colors */ @@ -155,7 +155,7 @@ typedef struct bGPDpalette { /* bGPDpalette->flag */ typedef enum eGPDpalette_Flag { /* palette is active */ - PL_PALETTE_ACTIVE = (1 << 0) +A, PL_PALETTE_ACTIVE = (1 << 0) } eGPDpalette_Flag; /* ***************************************** */ @@ -232,7 +232,7 @@ typedef enum eGPDstroke_Flag { * fill color for stroke and no fill area */ GP_STROKE_NOFILL = (1 << 8), /* only for use with stroke-buffer (while drawing eraser) */ - GP_STROKE_ERASER = (1 << 15) + GP_STROKE_ERASER = (1 << 15), } eGPDstroke_Flag; /* bGPDstroke->caps */ @@ -278,7 +278,7 @@ typedef enum eGPDframe_Flag { /* frame is being painted on */ GP_FRAME_PAINT = (1 << 0), /* for editing in Action Editor */ - GP_FRAME_SELECT = (1 << 1) + GP_FRAME_SELECT = (1 << 1), } eGPDframe_Flag; /* ***************************************** */ @@ -619,7 +619,7 @@ typedef enum eGP_OnionModes { typedef enum eGP_DepthOrdering { GP_XRAY_FRONT = 0, GP_XRAY_3DSPACE = 1, - GP_XRAY_BACK = 2 + GP_XRAY_BACK = 2, } eGP_DepthOrdering; /* ***************************************** */ diff --git a/source/blender/makesdna/DNA_image_types.h b/source/blender/makesdna/DNA_image_types.h index 2ca5856796c..8bca051739d 100644 --- a/source/blender/makesdna/DNA_image_types.h +++ b/source/blender/makesdna/DNA_image_types.h @@ -106,7 +106,7 @@ typedef struct RenderSlot { enum { TEXTARGET_TEXTURE_2D = 0, TEXTARGET_TEXTURE_CUBE_MAP = 1, - TEXTARGET_COUNT = 2 + TEXTARGET_COUNT = 2, }; typedef struct Image { diff --git a/source/blender/makesdna/DNA_key_types.h b/source/blender/makesdna/DNA_key_types.h index 740d8b274b4..2f03bd6cfd2 100644 --- a/source/blender/makesdna/DNA_key_types.h +++ b/source/blender/makesdna/DNA_key_types.h @@ -135,12 +135,12 @@ enum { KEY_NORMAL = 0, /* States to blend between (default) */ - KEY_RELATIVE = 1 + KEY_RELATIVE = 1, }; /* Key->flag */ enum { - KEY_DS_EXPAND = 1 + KEY_DS_EXPAND = 1, }; /* KeyBlock->type */ @@ -155,7 +155,7 @@ enum { enum { KEYBLOCK_MUTE = (1 << 0), KEYBLOCK_SEL = (1 << 1), - KEYBLOCK_LOCKED = (1 << 2) + KEYBLOCK_LOCKED = (1 << 2), }; #define KEYELEM_FLOAT_LEN_COORD 3 diff --git a/source/blender/makesdna/DNA_mask_types.h b/source/blender/makesdna/DNA_mask_types.h index 1b834cb6ee2..48861e60f0b 100644 --- a/source/blender/makesdna/DNA_mask_types.h +++ b/source/blender/makesdna/DNA_mask_types.h @@ -199,19 +199,19 @@ enum { enum { MASK_SPLINE_CYCLIC = (1 << 1), MASK_SPLINE_NOFILL = (1 << 2), - MASK_SPLINE_NOINTERSECT = (1 << 3) + MASK_SPLINE_NOINTERSECT = (1 << 3), }; /* MaskSpline->weight_interp */ enum { MASK_SPLINE_INTERP_LINEAR = 1, - MASK_SPLINE_INTERP_EASE = 2 + MASK_SPLINE_INTERP_EASE = 2, }; /* MaskSpline->offset_mode */ enum { MASK_SPLINE_OFFSET_EVEN = 0, - MASK_SPLINE_OFFSET_SMOOTH = 1 + MASK_SPLINE_OFFSET_SMOOTH = 1, }; @@ -230,13 +230,13 @@ enum { MASK_DT_OUTLINE = 0, MASK_DT_DASH = 1, MASK_DT_BLACK = 2, - MASK_DT_WHITE = 3 + MASK_DT_WHITE = 3, }; /* MaskSpaceInfo->overlay_mode */ enum { MASK_OVERLAY_ALPHACHANNEL = 0, - MASK_OVERLAY_COMBINED = 1 + MASK_OVERLAY_COMBINED = 1, }; /* masklay->blend */ @@ -249,12 +249,12 @@ enum { MASK_BLEND_REPLACE = 5, MASK_BLEND_DIFFERENCE = 6, MASK_BLEND_MERGE_ADD = 7, - MASK_BLEND_MERGE_SUBTRACT = 8 + MASK_BLEND_MERGE_SUBTRACT = 8, }; /* masklay->blend_flag */ enum { - MASK_BLENDFLAG_INVERT = (1 << 0) + MASK_BLENDFLAG_INVERT = (1 << 0), }; /* masklay->flag */ @@ -269,13 +269,13 @@ enum { /* masklay_shape->flag */ enum { - MASK_SHAPE_SELECT = (1 << 0) + MASK_SHAPE_SELECT = (1 << 0), }; /* mask->flag */ enum { - MASK_ANIMF_EXPAND = (1 << 4) + MASK_ANIMF_EXPAND = (1 << 4), }; #endif /* __DNA_MASK_TYPES_H__ */ diff --git a/source/blender/makesdna/DNA_material_types.h b/source/blender/makesdna/DNA_material_types.h index 41146a77e7b..144f1dfd6d1 100644 --- a/source/blender/makesdna/DNA_material_types.h +++ b/source/blender/makesdna/DNA_material_types.h @@ -128,7 +128,7 @@ typedef enum eMaterialGPencilStyle_Flag { /* Stroke show main switch */ GP_STYLE_STROKE_SHOW = (1 << 8), /* Fill show main switch */ - GP_STYLE_FILL_SHOW = (1 << 9) + GP_STYLE_FILL_SHOW = (1 << 9), } eMaterialGPencilStyle_Flag; typedef enum eMaterialGPencilStyle_Mode { diff --git a/source/blender/makesdna/DNA_movieclip_types.h b/source/blender/makesdna/DNA_movieclip_types.h index 58041284d84..18676eb207d 100644 --- a/source/blender/makesdna/DNA_movieclip_types.h +++ b/source/blender/makesdna/DNA_movieclip_types.h @@ -164,19 +164,19 @@ enum { MCLIP_PROXY_UNDISTORTED_SIZE_25 = (1 << 4), MCLIP_PROXY_UNDISTORTED_SIZE_50 = (1 << 5), MCLIP_PROXY_UNDISTORTED_SIZE_75 = (1 << 6), - MCLIP_PROXY_UNDISTORTED_SIZE_100 = (1 << 7) + MCLIP_PROXY_UNDISTORTED_SIZE_100 = (1 << 7), }; /* MovieClip->source */ enum { MCLIP_SRC_SEQUENCE = 1, - MCLIP_SRC_MOVIE = 2 + MCLIP_SRC_MOVIE = 2, }; /* MovieClip->selection types */ enum { MCLIP_SEL_NONE = 0, - MCLIP_SEL_TRACK = 1 + MCLIP_SEL_TRACK = 1, }; /* MovieClip->flag */ @@ -186,7 +186,7 @@ enum { /* MCLIP_CUSTOM_START_FRAME = (1<<2), */ /* UNUSED */ MCLIP_DATA_EXPAND = (1 << 3), - MCLIP_TIMECODE_FLAGS = (MCLIP_USE_PROXY | MCLIP_USE_PROXY_CUSTOM_DIR) + MCLIP_TIMECODE_FLAGS = (MCLIP_USE_PROXY | MCLIP_USE_PROXY_CUSTOM_DIR), }; /* MovieClip->render_size */ @@ -195,12 +195,12 @@ enum { MCLIP_PROXY_RENDER_SIZE_25 = 1, MCLIP_PROXY_RENDER_SIZE_50 = 2, MCLIP_PROXY_RENDER_SIZE_75 = 3, - MCLIP_PROXY_RENDER_SIZE_100 = 4 + MCLIP_PROXY_RENDER_SIZE_100 = 4, }; /* MovieClip->render_flag */ enum { - MCLIP_PROXY_RENDER_UNDISTORT = 1 + MCLIP_PROXY_RENDER_UNDISTORT = 1, }; #endif diff --git a/source/blender/makesdna/DNA_nla_types.h b/source/blender/makesdna/DNA_nla_types.h index a10504e6b3e..eadbb339bca 100644 --- a/source/blender/makesdna/DNA_nla_types.h +++ b/source/blender/makesdna/DNA_nla_types.h @@ -115,7 +115,7 @@ typedef enum eActStrip_Flag { ACTSTRIP_CYCLIC_USEX = (1<<8), ACTSTRIP_CYCLIC_USEY = (1<<9), ACTSTRIP_CYCLIC_USEZ = (1<<10), - ACTSTRIP_AUTO_BLENDS = (1<<11) + ACTSTRIP_AUTO_BLENDS = (1<<11), } eActStrip_Flag; #endif diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h index 45d8b544ad4..ddf7175ba40 100644 --- a/source/blender/makesdna/DNA_node_types.h +++ b/source/blender/makesdna/DNA_node_types.h @@ -162,20 +162,20 @@ typedef enum eNodeSocketDatatype { SOCK_BOOLEAN = 4, __SOCK_MESH = 5, /* deprecated */ SOCK_INT = 6, - SOCK_STRING = 7 + SOCK_STRING = 7, } eNodeSocketDatatype; /* socket shape */ typedef enum eNodeSocketDrawShape { SOCK_DRAW_SHAPE_CIRCLE = 0, SOCK_DRAW_SHAPE_SQUARE = 1, - SOCK_DRAW_SHAPE_DIAMOND = 2 + SOCK_DRAW_SHAPE_DIAMOND = 2, } eNodeSocketDrawShape; /* socket side (input/output) */ typedef enum eNodeSocketInOut { SOCK_IN = 1, - SOCK_OUT = 2 + SOCK_OUT = 2, } eNodeSocketInOut; /* sock->flag, first bit is select */ @@ -531,7 +531,7 @@ typedef enum eNodeTreeUpdate { NTREE_UPDATE_GROUP_IN = (1 << 4), /* group inputs have changed */ NTREE_UPDATE_GROUP_OUT = (1 << 5), /* group outputs have changed */ /* group has changed (generic flag including all other group flags) */ - NTREE_UPDATE_GROUP = (NTREE_UPDATE_GROUP_IN | NTREE_UPDATE_GROUP_OUT) + NTREE_UPDATE_GROUP = (NTREE_UPDATE_GROUP_IN | NTREE_UPDATE_GROUP_OUT), } eNodeTreeUpdate; @@ -581,25 +581,25 @@ enum { CMP_NODE_MASKTYPE_ADD = 0, CMP_NODE_MASKTYPE_SUBTRACT = 1, CMP_NODE_MASKTYPE_MULTIPLY = 2, - CMP_NODE_MASKTYPE_NOT = 3 + CMP_NODE_MASKTYPE_NOT = 3, }; enum { CMP_NODE_LENSFLARE_GHOST = (1 << 0), CMP_NODE_LENSFLARE_GLOW = (1 << 1), CMP_NODE_LENSFLARE_CIRCLE = (1 << 2), - CMP_NODE_LENSFLARE_STREAKS = (1 << 3) + CMP_NODE_LENSFLARE_STREAKS = (1 << 3), }; enum { CMP_NODE_DILATEERODE_STEP = 0, CMP_NODE_DILATEERODE_DISTANCE_THRESH = 1, CMP_NODE_DILATEERODE_DISTANCE = 2, - CMP_NODE_DILATEERODE_DISTANCE_FEATHER = 3 + CMP_NODE_DILATEERODE_DISTANCE_FEATHER = 3, }; enum { - CMP_NODE_INPAINT_SIMPLE = 0 + CMP_NODE_INPAINT_SIMPLE = 0, }; enum { @@ -609,7 +609,7 @@ enum { /* we may want multiple aspect options, exposed as an rna enum */ CMP_NODEFLAG_MASK_FIXED = (1 << 8), - CMP_NODEFLAG_MASK_FIXED_SCENE = (1 << 9) + CMP_NODEFLAG_MASK_FIXED_SCENE = (1 << 9), }; enum { diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index 512d85ad694..4bb639661e9 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -581,7 +581,7 @@ enum { enum { GP_EMPTY = 0, GP_STROKE = 1, - GP_MONKEY = 2 + GP_MONKEY = 2, }; /* boundtype */ diff --git a/source/blender/makesdna/DNA_packedFile_types.h b/source/blender/makesdna/DNA_packedFile_types.h index d2e0dd92cbc..22e8d477abd 100644 --- a/source/blender/makesdna/DNA_packedFile_types.h +++ b/source/blender/makesdna/DNA_packedFile_types.h @@ -53,7 +53,7 @@ enum ePF_FileStatus { PF_REMOVE = 8, PF_NOOP = 9, - PF_ASK = 10 + PF_ASK = 10, }; #endif /* PACKEDFILE_TYPES_H */ diff --git a/source/blender/makesdna/DNA_rigidbody_types.h b/source/blender/makesdna/DNA_rigidbody_types.h index d22e195732d..10d99199c65 100644 --- a/source/blender/makesdna/DNA_rigidbody_types.h +++ b/source/blender/makesdna/DNA_rigidbody_types.h @@ -101,7 +101,7 @@ typedef enum eRigidBodyWorld_Flag { /* sim data needs to be rebuilt */ RBW_FLAG_NEEDS_REBUILD = (1 << 1), /* usse split impulse when stepping the simulation */ - RBW_FLAG_USE_SPLIT_IMPULSE = (1 << 2) + RBW_FLAG_USE_SPLIT_IMPULSE = (1 << 2), } eRigidBodyWorld_Flag; /* ******************************** */ @@ -200,7 +200,7 @@ typedef enum eRigidBodyOb_Flag { /* collision margin is not embedded (only used by convex hull shapes for now) */ RBO_FLAG_USE_MARGIN = (1 << 6), /* collision shape deforms during simulation (only for passive triangle mesh shapes) */ - RBO_FLAG_USE_DEFORM = (1 << 7) + RBO_FLAG_USE_DEFORM = (1 << 7), } eRigidBodyOb_Flag; /* RigidBody Collision Shape */ @@ -374,7 +374,7 @@ typedef enum eRigidBodyCon_Flag { /* angular springs */ RBC_FLAG_USE_SPRING_ANG_X = (1 << 16), RBC_FLAG_USE_SPRING_ANG_Y = (1 << 17), - RBC_FLAG_USE_SPRING_ANG_Z = (1 << 18) + RBC_FLAG_USE_SPRING_ANG_Z = (1 << 18), } eRigidBodyCon_Flag; /* ******************************** */ diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index 2858221cee1..869531bf963 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -1024,7 +1024,7 @@ typedef struct VPaint { /* VPaint.flag */ enum { /* weight paint only */ - VP_FLAG_VGROUP_RESTRICT = (1 << 7) + VP_FLAG_VGROUP_RESTRICT = (1 << 7), }; /* ------------------------------------------- */ @@ -1056,7 +1056,7 @@ typedef enum eGP_Lockaxis_Types { GP_LOCKAXIS_VIEW = 0, GP_LOCKAXIS_X = 1, GP_LOCKAXIS_Y = 2, - GP_LOCKAXIS_Z = 3 + GP_LOCKAXIS_Z = 3, } eGP_Lockaxis_Types; /* Settings for a GPencil Stroke Sculpting Brush */ @@ -1306,7 +1306,7 @@ typedef enum { /* only used if unified alpha is enabled, mirrors the brush flag * BRUSH_ALPHA_PRESSURE */ - UNIFIED_PAINT_BRUSH_ALPHA_PRESSURE = (1 << 4) + UNIFIED_PAINT_BRUSH_ALPHA_PRESSURE = (1 << 4), } eUnifiedPaintSettingsFlags; @@ -2111,7 +2111,7 @@ enum { enum { OB_DRAW_GROUPUSER_NONE = 0, OB_DRAW_GROUPUSER_ACTIVE = 1, - OB_DRAW_GROUPUSER_ALL = 2 + OB_DRAW_GROUPUSER_ALL = 2, }; /* toolsettings->face_strength */ @@ -2128,7 +2128,7 @@ typedef enum eVGroupSelect { WT_VGROUP_ACTIVE = 1, WT_VGROUP_BONE_SELECT = 2, WT_VGROUP_BONE_DEFORM = 3, - WT_VGROUP_BONE_DEFORM_OFF = 4 + WT_VGROUP_BONE_DEFORM_OFF = 4, } eVGroupSelect; #define WT_VGROUP_MASK_ALL \ @@ -2173,7 +2173,7 @@ typedef enum ePaintFlags { PAINT_SHOW_BRUSH = (1 << 0), PAINT_FAST_NAVIGATE = (1 << 1), PAINT_SHOW_BRUSH_ON_SURFACE = (1 << 2), - PAINT_USE_CAVITY_MASK = (1 << 3) + PAINT_USE_CAVITY_MASK = (1 << 3), } ePaintFlags; /* Paint.symmetry_flags @@ -2344,7 +2344,7 @@ typedef enum eGPencil_Placement_Flags { typedef enum eGPencil_Selectmode_types { GP_SELECTMODE_POINT = 0, GP_SELECTMODE_STROKE = 1, - GP_SELECTMODE_SEGMENT = 2 + GP_SELECTMODE_SEGMENT = 2, } eGPencil_Selectmode_types; /* ToolSettings.gpencil_guide_types */ diff --git a/source/blender/makesdna/DNA_screen_types.h b/source/blender/makesdna/DNA_screen_types.h index 71b05a2bffa..9f598d1ba9a 100644 --- a/source/blender/makesdna/DNA_screen_types.h +++ b/source/blender/makesdna/DNA_screen_types.h @@ -563,7 +563,7 @@ enum { /** Special flag to indicate that order is locked (not user-changeable). */ UILST_FLT_SORT_LOCK = 1u << 30, /** Special value, bitflag used to reverse order! */ - UILST_FLT_SORT_REVERSE = 1u << 31 + UILST_FLT_SORT_REVERSE = 1u << 31, }; #define UILST_FLT_SORT_MASK (((unsigned int)(UILST_FLT_SORT_REVERSE | UILST_FLT_SORT_LOCK)) - 1) diff --git a/source/blender/makesdna/DNA_sequence_types.h b/source/blender/makesdna/DNA_sequence_types.h index cce4b41fde2..bfaff95addc 100644 --- a/source/blender/makesdna/DNA_sequence_types.h +++ b/source/blender/makesdna/DNA_sequence_types.h @@ -543,7 +543,7 @@ enum { /* seq->alpha_mode */ enum { SEQ_ALPHA_STRAIGHT = 0, - SEQ_ALPHA_PREMUL = 1 + SEQ_ALPHA_PREMUL = 1, }; /* seq->type WATCH IT: SEQ_TYPE_EFFECT BIT is used to determine if this is an effect strip!!! */ @@ -598,7 +598,7 @@ enum { SEQ_TYPE_DIFFERENCE = 59, SEQ_TYPE_EXCLUSION = 60, - SEQ_TYPE_MAX = 60 + SEQ_TYPE_MAX = 60, }; #define SEQ_MOVIECLIP_RENDER_UNDISTORTED (1 << 0) @@ -636,7 +636,7 @@ enum { enum { SEQUENCE_MASK_INPUT_STRIP = 0, - SEQUENCE_MASK_INPUT_ID = 1 + SEQUENCE_MASK_INPUT_ID = 1, }; enum { diff --git a/source/blender/makesdna/DNA_shader_fx_types.h b/source/blender/makesdna/DNA_shader_fx_types.h index 613c4641d16..7701950f98c 100644 --- a/source/blender/makesdna/DNA_shader_fx_types.h +++ b/source/blender/makesdna/DNA_shader_fx_types.h @@ -98,7 +98,7 @@ typedef struct BlurShaderFxData { } BlurShaderFxData; typedef enum eBlurShaderFx_Flag { - FX_BLUR_DOF_MODE = (1 << 0) + FX_BLUR_DOF_MODE = (1 << 0), } eBlurShaderFx_Flag; typedef struct ColorizeShaderFxData { diff --git a/source/blender/makesdna/DNA_sound_types.h b/source/blender/makesdna/DNA_sound_types.h index f8b5fc819ae..9edf5ef7475 100644 --- a/source/blender/makesdna/DNA_sound_types.h +++ b/source/blender/makesdna/DNA_sound_types.h @@ -110,7 +110,7 @@ typedef enum eSound_Type { SOUND_TYPE_INVALID = -1, SOUND_TYPE_FILE = 0, SOUND_TYPE_BUFFER = 1, - SOUND_TYPE_LIMITER = 2 + SOUND_TYPE_LIMITER = 2, } eSound_Type; #endif diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h index 6e523235426..4ffd6c4842e 100644 --- a/source/blender/makesdna/DNA_space_types.h +++ b/source/blender/makesdna/DNA_space_types.h @@ -631,7 +631,7 @@ typedef enum eSpaceSeq_Proxy_RenderSize { SEQ_PROXY_RENDER_SIZE_50 = 50, SEQ_PROXY_RENDER_SIZE_75 = 75, SEQ_PROXY_RENDER_SIZE_100 = 99, - SEQ_PROXY_RENDER_SIZE_FULL = 100 + SEQ_PROXY_RENDER_SIZE_FULL = 100, } eSpaceSeq_Proxy_RenderSize; typedef struct MaskSpaceInfo { @@ -648,7 +648,7 @@ typedef struct MaskSpaceInfo { typedef enum eSpaceSeq_OverlayType { SEQ_DRAW_OVERLAY_RECT = 0, SEQ_DRAW_OVERLAY_REFERENCE = 1, - SEQ_DRAW_OVERLAY_CURRENT = 2 + SEQ_DRAW_OVERLAY_CURRENT = 2, } eSpaceSeq_OverlayType; /** \} */ @@ -758,7 +758,7 @@ enum eFileDisplayType { FILE_DEFAULTDISPLAY = 0, FILE_SHORTDISPLAY = 1, FILE_LONGDISPLAY = 2, - FILE_IMGDISPLAY = 3 + FILE_IMGDISPLAY = 3, }; /* FileSelectParams.sort */ @@ -767,7 +767,7 @@ enum eFileSortType { FILE_SORT_ALPHA = 1, FILE_SORT_EXTENSION = 2, FILE_SORT_TIME = 3, - FILE_SORT_SIZE = 4 + FILE_SORT_SIZE = 4, }; /* these values need to be hardcoded in structs, dna does not recognize defines */ @@ -1385,7 +1385,7 @@ typedef enum eConsoleLine_Type { CONSOLE_LINE_OUTPUT = 0, CONSOLE_LINE_INPUT = 1, CONSOLE_LINE_INFO = 2, /* autocomp feedback */ - CONSOLE_LINE_ERROR = 3 + CONSOLE_LINE_ERROR = 3, } eConsoleLine_Type; @@ -1627,7 +1627,7 @@ typedef enum eSpace_Type { SPACE_TOPBAR = 21, SPACE_STATUSBAR = 22, - SPACE_TYPE_LAST = SPACE_STATUSBAR + SPACE_TYPE_LAST = SPACE_STATUSBAR, } eSpace_Type; /* use for function args */ diff --git a/source/blender/makesdna/DNA_tracking_types.h b/source/blender/makesdna/DNA_tracking_types.h index fea6e5caeb9..6aad815435c 100644 --- a/source/blender/makesdna/DNA_tracking_types.h +++ b/source/blender/makesdna/DNA_tracking_types.h @@ -463,13 +463,13 @@ typedef struct MovieTracking { /* MovieTrackingCamera->distortion_model */ enum { TRACKING_DISTORTION_MODEL_POLYNOMIAL = 0, - TRACKING_DISTORTION_MODEL_DIVISION = 1 + TRACKING_DISTORTION_MODEL_DIVISION = 1, }; /* MovieTrackingCamera->units */ enum { CAMERA_UNITS_PX = 0, - CAMERA_UNITS_MM = 1 + CAMERA_UNITS_MM = 1, }; /* MovieTrackingMarker->flag */ @@ -478,7 +478,7 @@ enum { MARKER_TRACKED = (1 << 1), MARKER_GRAPH_SEL_X = (1 << 2), MARKER_GRAPH_SEL_Y = (1 << 3), - MARKER_GRAPH_SEL = (MARKER_GRAPH_SEL_X | MARKER_GRAPH_SEL_Y) + MARKER_GRAPH_SEL = (MARKER_GRAPH_SEL_X | MARKER_GRAPH_SEL_Y), }; /* MovieTrackingTrack->flag */ @@ -494,7 +494,7 @@ enum { TRACK_PREVIEW_GRAYSCALE = (1 << 9), TRACK_DOPE_SEL = (1 << 10), TRACK_PREVIEW_ALPHA = (1 << 11), - TRACK_USE_2D_STAB_ROT = (1 << 12) + TRACK_USE_2D_STAB_ROT = (1 << 12), }; /* MovieTrackingTrack->motion_model */ @@ -504,33 +504,33 @@ enum { TRACK_MOTION_MODEL_TRANSLATION_SCALE = 2, TRACK_MOTION_MODEL_TRANSLATION_ROTATION_SCALE = 3, TRACK_MOTION_MODEL_AFFINE = 4, - TRACK_MOTION_MODEL_HOMOGRAPHY = 5 + TRACK_MOTION_MODEL_HOMOGRAPHY = 5, }; /* MovieTrackingTrack->algorithm_flag */ enum { TRACK_ALGORITHM_FLAG_USE_BRUTE = (1 << 0), TRACK_ALGORITHM_FLAG_USE_NORMALIZATION = (1 << 2), - TRACK_ALGORITHM_FLAG_USE_MASK = (1 << 3) + TRACK_ALGORITHM_FLAG_USE_MASK = (1 << 3), }; /* MovieTrackingTrack->adjframes */ enum { TRACK_MATCH_KEYFRAME = 0, - TRACK_MATCH_PREVFRAME = 1 + TRACK_MATCH_PREVFRAME = 1, }; /* MovieTrackingSettings->flag */ enum { TRACKING_SETTINGS_SHOW_DEFAULT_EXPANDED = (1 << 0), - TRACKING_SETTINGS_SHOW_EXTRA_EXPANDED = (1 << 1) + TRACKING_SETTINGS_SHOW_EXTRA_EXPANDED = (1 << 1), }; /* MovieTrackingSettings->motion_flag */ enum { TRACKING_MOTION_TRIPOD = (1 << 0), - TRACKING_MOTION_MODAL = (TRACKING_MOTION_TRIPOD) + TRACKING_MOTION_MODAL = (TRACKING_MOTION_TRIPOD), }; /* MovieTrackingSettings->speed */ @@ -539,13 +539,13 @@ enum { TRACKING_SPEED_REALTIME = 1, TRACKING_SPEED_HALF = 2, TRACKING_SPEED_QUARTER = 4, - TRACKING_SPEED_DOUBLE = 5 + TRACKING_SPEED_DOUBLE = 5, }; /* MovieTrackingSettings->reconstruction_flag */ enum { /* TRACKING_USE_FALLBACK_RECONSTRUCTION = (1 << 0), */ /* DEPRECATED */ - TRACKING_USE_KEYFRAME_SELECTION = (1 << 1) + TRACKING_USE_KEYFRAME_SELECTION = (1 << 1), }; /* MovieTrackingSettings->refine_camera_intrinsics */ @@ -553,7 +553,7 @@ enum { REFINE_FOCAL_LENGTH = (1 << 0), REFINE_PRINCIPAL_POINT = (1 << 1), REFINE_RADIAL_DISTORTION_K1 = (1 << 2), - REFINE_RADIAL_DISTORTION_K2 = (1 << 4) + REFINE_RADIAL_DISTORTION_K2 = (1 << 4), }; /* MovieTrackingStrabilization->flag */ @@ -562,30 +562,30 @@ enum { TRACKING_AUTOSCALE = (1 << 1), TRACKING_STABILIZE_ROTATION = (1 << 2), TRACKING_STABILIZE_SCALE = (1 << 3), - TRACKING_SHOW_STAB_TRACKS = (1 << 5) + TRACKING_SHOW_STAB_TRACKS = (1 << 5), }; /* MovieTrackingStrabilization->filter */ enum { TRACKING_FILTER_NEAREST = 0, TRACKING_FILTER_BILINEAR = 1, - TRACKING_FILTER_BICUBIC = 2 + TRACKING_FILTER_BICUBIC = 2, }; /* MovieTrackingReconstruction->flag */ enum { - TRACKING_RECONSTRUCTED = (1 << 0) + TRACKING_RECONSTRUCTED = (1 << 0), }; /* MovieTrackingObject->flag */ enum { - TRACKING_OBJECT_CAMERA = (1 << 0) + TRACKING_OBJECT_CAMERA = (1 << 0), }; enum { TRACKING_CLEAN_SELECT = 0, TRACKING_CLEAN_DELETE_TRACK = 1, - TRACKING_CLEAN_DELETE_SEGMENT = 2 + TRACKING_CLEAN_DELETE_SEGMENT = 2, }; /* MovieTrackingDopesheet->sort_method */ @@ -593,21 +593,21 @@ enum { TRACKING_DOPE_SORT_NAME = 0, TRACKING_DOPE_SORT_LONGEST = 1, TRACKING_DOPE_SORT_TOTAL = 2, - TRACKING_DOPE_SORT_AVERAGE_ERROR = 3 + TRACKING_DOPE_SORT_AVERAGE_ERROR = 3, }; /* MovieTrackingDopesheet->flag */ enum { TRACKING_DOPE_SORT_INVERSE = (1 << 0), TRACKING_DOPE_SELECTED_ONLY = (1 << 1), - TRACKING_DOPE_SHOW_HIDDEN = (1 << 2) + TRACKING_DOPE_SHOW_HIDDEN = (1 << 2), }; /* MovieTrackingDopesheetCoverageSegment->trackness */ enum { TRACKING_COVERAGE_BAD = 0, TRACKING_COVERAGE_ACCEPTABLE = 1, - TRACKING_COVERAGE_OK = 2 + TRACKING_COVERAGE_OK = 2, }; /* MovieTrackingPlaneMarker->flag */ diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index 3d7ec9ea331..996cfeb76b4 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -61,7 +61,7 @@ typedef enum eUIFont_ID { /* free slots */ UIFONT_CUSTOM1 = 2, - UIFONT_CUSTOM2 = 3 + UIFONT_CUSTOM2 = 3, } eUIFont_ID; /* default fonts to load/initialize */ @@ -862,7 +862,7 @@ typedef enum ePathCompare_Flag { typedef enum eViewZoom_Style { USER_ZOOM_CONT = 0, USER_ZOOM_SCALE = 1, - USER_ZOOM_DOLLY = 2 + USER_ZOOM_DOLLY = 2, } eViewZoom_Style; /* UserDef.navigation_mode */ @@ -909,7 +909,7 @@ typedef enum eUserpref_UI_Flag { USER_HIDE_RECENT = (1 << 28), USER_SHOW_THUMBNAILS = (1 << 29), USER_QUIT_PROMPT = (1 << 30), - USER_HIDE_SYSTEM_BOOKMARKS = (1u << 31) + USER_HIDE_SYSTEM_BOOKMARKS = (1u << 31), } eUserpref_UI_Flag; /* UserDef.uiflag2 */ @@ -940,7 +940,7 @@ typedef enum eAutokey_Mode { /** AUTOKEY_ON + 2**n... (i.e. AUTOKEY_MODE_NORMAL = AUTOKEY_ON + 2) * to preserve setting, even when autokey turned off */ AUTOKEY_MODE_NORMAL = 3, - AUTOKEY_MODE_EDITKEYS = 5 + AUTOKEY_MODE_EDITKEYS = 5, } eAutokey_Mode; /* Zoom to frame mode. @@ -948,7 +948,7 @@ typedef enum eAutokey_Mode { typedef enum eZoomFrame_Mode { ZOOM_FRAME_MODE_KEEP_RANGE = 0, ZOOM_FRAME_MODE_SECONDS = 1, - ZOOM_FRAME_MODE_KEYFRAMES = 2 + ZOOM_FRAME_MODE_KEYFRAMES = 2, } eZoomFrame_Mode; /* Auto-Keying flag @@ -994,14 +994,14 @@ typedef enum eDupli_ID_Flags { USER_DUP_TEX = (1 << 8), USER_DUP_ARM = (1 << 9), USER_DUP_ACT = (1 << 10), - USER_DUP_PSYS = (1 << 11) + USER_DUP_PSYS = (1 << 11), } eDupli_ID_Flags; /* selection method for opengl gpu_select_method */ typedef enum eOpenGL_SelectOptions { USER_SELECT_AUTO = 0, USER_SELECT_USE_OCCLUSION_QUERY = 1, - USER_SELECT_USE_SELECT_RENDERMODE = 2 + USER_SELECT_USE_SELECT_RENDERMODE = 2, } eOpenGL_SelectOptions; /* max anti alias draw method UserDef.gpu_viewport_antialias */ @@ -1077,7 +1077,7 @@ typedef enum eTheme_DrawTypes { TH_ROUNDSHADED = 1, TH_ROUNDED = 2, TH_OLDSKOOL = 3, - TH_SHADED = 4 + TH_SHADED = 4, } eTheme_DrawTypes; /* UserDef.ndof_flag (3D mouse options) */ |