diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-10-21 09:46:41 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-10-21 09:46:41 +0400 |
commit | f3ece5a108db0bdbefb4663ef4ebd9a7e039e263 (patch) | |
tree | cb6329453be169ef1ec49ef8b8d50a6b14364880 /source/blender/makesdna | |
parent | a1a0c8da13a7b91b0264c7535752864379f3d852 (diff) |
style cleanup: trailing tabs & expand some non prefix tabs into spaces.
Diffstat (limited to 'source/blender/makesdna')
22 files changed, 264 insertions, 264 deletions
diff --git a/source/blender/makesdna/DNA_actuator_types.h b/source/blender/makesdna/DNA_actuator_types.h index 4a5ad69cb91..b445d59db2c 100644 --- a/source/blender/makesdna/DNA_actuator_types.h +++ b/source/blender/makesdna/DNA_actuator_types.h @@ -46,21 +46,21 @@ typedef struct bAddObjectActuator { struct Object *ob; } bAddObjectActuator; -typedef struct bActionActuator { - struct bAction *act; /* Pointer to action */ - short type, flag; /* Playback type */ // not in use - float sta, end; /* Start & End frames */ - char name[64]; /* For property-driven playback, MAX_NAME */ - char frameProp[64]; /* Set this property to the actions current frame, MAX_NAME */ - short blendin; /* Number of frames of blending */ - short priority; /* Execution priority */ - short layer; /* Animation layer */ - short end_reset; /* Ending the actuator (negative pulse) wont reset the the action to its starting frame */ - short strideaxis; /* Displacement axis */ - short pad; - float stridelength; /* Displacement incurred by cycle */ // not in use - float layer_weight; /* How much of the previous layer to use for blending. (<0 = disable, 0 = add mode) */ -} bActionActuator; +typedef struct bActionActuator { + struct bAction *act; /* Pointer to action */ + short type, flag; /* Playback type */ // not in use + float sta, end; /* Start & End frames */ + char name[64]; /* For property-driven playback, MAX_NAME */ + char frameProp[64]; /* Set this property to the actions current frame, MAX_NAME */ + short blendin; /* Number of frames of blending */ + short priority; /* Execution priority */ + short layer; /* Animation layer */ + short end_reset; /* Ending the actuator (negative pulse) wont reset the the action to its starting frame */ + short strideaxis; /* Displacement axis */ + short pad; + float stridelength; /* Displacement incurred by cycle */ // not in use + float layer_weight; /* How much of the previous layer to use for blending. (<0 = disable, 0 = add mode) */ +} bActionActuator; typedef struct Sound3D { float min_gain; @@ -261,7 +261,7 @@ typedef struct bActuator { /** * For ipo's and props: to find out which object the actuator * belongs to */ - struct Object *ob; + struct Object *ob; } bActuator; diff --git a/source/blender/makesdna/DNA_anim_types.h b/source/blender/makesdna/DNA_anim_types.h index 7cf0d588710..1ac6e6db94b 100644 --- a/source/blender/makesdna/DNA_anim_types.h +++ b/source/blender/makesdna/DNA_anim_types.h @@ -246,13 +246,13 @@ typedef enum eFMod_Noise_Modifications { /* stepped modifier data */ typedef struct FMod_Stepped { - float step_size; /* Number of frames each interpolated value should be held */ - float offset; /* Reference frame number that stepping starts from */ - - float start_frame; /* start frame of the frame range that modifier works in */ - float end_frame; /* end frame of the frame range that modifier works in */ - - int flag; /* various settings */ + float step_size; /* Number of frames each interpolated value should be held */ + float offset; /* Reference frame number that stepping starts from */ + + float start_frame; /* start frame of the frame range that modifier works in */ + float end_frame; /* end frame of the frame range that modifier works in */ + + int flag; /* various settings */ } FMod_Stepped; /* stepped modifier range flags */ @@ -325,14 +325,14 @@ typedef enum eDriverTarget_TransformChannels { */ typedef struct DriverVar { struct DriverVar *next, *prev; - - char name[64]; /* name of the variable to use in py-expression (must be valid python identifier) */ - - DriverTarget targets[8]; /* MAX_DRIVER_TARGETS, target slots */ - short num_targets; /* number of targets actually used by this variable */ - - short type; /* type of driver target (eDriverTarget_Types) */ - float curval; /* result of previous evaluation */ + + char name[64]; /* name of the variable to use in py-expression (must be valid python identifier) */ + + DriverTarget targets[8]; /* MAX_DRIVER_TARGETS, target slots */ + short num_targets; /* number of targets actually used by this variable */ + + short type; /* type of driver target (eDriverTarget_Types) */ + float curval; /* result of previous evaluation */ } DriverVar; /* Driver Variable Types */ @@ -556,36 +556,36 @@ typedef struct AnimMapper { */ typedef struct NlaStrip { struct NlaStrip *next, *prev; - - ListBase strips; /* 'Child' strips (used for 'meta' strips) */ - bAction *act; /* Action that is referenced by this strip (strip is 'user' of the action) */ - AnimMapper *remap; /* Remapping info this strip (for tweaking correspondence of action with context) */ - - ListBase fcurves; /* F-Curves for controlling this strip's influence and timing */ // TODO: move out? - ListBase modifiers; /* F-Curve modifiers to be applied to the entire strip's referenced F-Curves */ - - char name[64]; /* User-Visible Identifier for Strip */ - - float influence; /* Influence of strip */ - float strip_time; /* Current 'time' within action being used (automatically evaluated, but can be overridden) */ - - float start, end; /* extents of the strip */ - float actstart, actend; /* range of the action to use */ - - float repeat; /* The number of times to repeat the action range (only when no F-Curves) */ - float scale; /* The amount the action range is scaled by (only when no F-Curves) */ - - float blendin, blendout; /* strip blending length (only used when there are no F-Curves) */ - short blendmode; /* strip blending mode (layer-based mixing) */ - - short extendmode; /* strip extrapolation mode (time-based mixing) */ + + ListBase strips; /* 'Child' strips (used for 'meta' strips) */ + bAction *act; /* Action that is referenced by this strip (strip is 'user' of the action) */ + AnimMapper *remap; /* Remapping info this strip (for tweaking correspondence of action with context) */ + + ListBase fcurves; /* F-Curves for controlling this strip's influence and timing */ // TODO: move out? + ListBase modifiers; /* F-Curve modifiers to be applied to the entire strip's referenced F-Curves */ + + char name[64]; /* User-Visible Identifier for Strip */ + + float influence; /* Influence of strip */ + float strip_time; /* Current 'time' within action being used (automatically evaluated, but can be overridden) */ + + float start, end; /* extents of the strip */ + float actstart, actend; /* range of the action to use */ + + float repeat; /* The number of times to repeat the action range (only when no F-Curves) */ + float scale; /* The amount the action range is scaled by (only when no F-Curves) */ + + float blendin, blendout; /* strip blending length (only used when there are no F-Curves) */ + short blendmode; /* strip blending mode (layer-based mixing) */ + + short extendmode; /* strip extrapolation mode (time-based mixing) */ short pad1; - - short type; /* type of NLA strip */ - - void *speaker_handle; /* handle for speaker objects */ - - int flag; /* settings */ + + short type; /* type of NLA strip */ + + void *speaker_handle; /* handle for speaker objects */ + + int flag; /* settings */ int pad2; } NlaStrip; @@ -600,48 +600,48 @@ typedef enum eNlaStrip_Blend_Mode { /* NLA Strip Extrpolation Mode */ typedef enum eNlaStrip_Extrapolate_Mode { /* extend before first frame if no previous strips in track, and always hold+extend last frame */ - NLASTRIP_EXTEND_HOLD = 0, + NLASTRIP_EXTEND_HOLD = 0, /* only hold+extend last frame */ - NLASTRIP_EXTEND_HOLD_FORWARD, + NLASTRIP_EXTEND_HOLD_FORWARD = 1, /* don't contribute at all */ - NLASTRIP_EXTEND_NOTHING + NLASTRIP_EXTEND_NOTHING = 2 } eNlaStrip_Extrapolate_Mode; /* NLA Strip Settings */ typedef enum eNlaStrip_Flag { /* UI selection flags */ /* NLA strip is the active one in the track (also indicates if strip is being tweaked) */ - NLASTRIP_FLAG_ACTIVE = (1<<0), + NLASTRIP_FLAG_ACTIVE = (1<<0), /* NLA strip is selected for editing */ - NLASTRIP_FLAG_SELECT = (1<<1), -// NLASTRIP_FLAG_SELECT_L = (1<<2), // left handle selected -// NLASTRIP_FLAG_SELECT_R = (1<<3), // right handle selected + NLASTRIP_FLAG_SELECT = (1<<1), +// NLASTRIP_FLAG_SELECT_L = (1<<2), // left handle selected +// NLASTRIP_FLAG_SELECT_R = (1<<3), // right handle selected /* NLA strip uses the same action that the action being tweaked uses (not set for the twaking one though) */ - NLASTRIP_FLAG_TWEAKUSER = (1<<4), - + NLASTRIP_FLAG_TWEAKUSER = (1<<4), + /* controls driven by local F-Curves */ /* strip influence is controlled by local F-Curve */ - NLASTRIP_FLAG_USR_INFLUENCE = (1<<5), - NLASTRIP_FLAG_USR_TIME = (1<<6), + NLASTRIP_FLAG_USR_INFLUENCE = (1<<5), + NLASTRIP_FLAG_USR_TIME = (1<<6), NLASTRIP_FLAG_USR_TIME_CYCLIC = (1<<7), - + /* NLA strip length is synced to the length of the referenced action */ - NLASTRIP_FLAG_SYNC_LENGTH = (1<<9), - + NLASTRIP_FLAG_SYNC_LENGTH = (1<<9), + /* playback flags (may be overridden by F-Curves) */ /* NLA strip blendin/out values are set automatically based on overlaps */ - NLASTRIP_FLAG_AUTO_BLENDS = (1<<10), + NLASTRIP_FLAG_AUTO_BLENDS = (1<<10), /* NLA strip is played back in reverse order */ - NLASTRIP_FLAG_REVERSE = (1<<11), + NLASTRIP_FLAG_REVERSE = (1<<11), /* NLA strip is muted (i.e. doesn't contribute in any way) */ - NLASTRIP_FLAG_MUTED = (1<<12), + NLASTRIP_FLAG_MUTED = (1<<12), /* NLA Strip is played back in 'ping-pong' style */ - NLASTRIP_FLAG_MIRROR = (1<<13), - + NLASTRIP_FLAG_MIRROR = (1<<13), + /* temporary editing flags */ /* NLA-Strip is really just a temporary meta used to facilitate easier transform code */ - NLASTRIP_FLAG_TEMP_META = (1<<30), - NLASTRIP_FLAG_EDIT_TOUCHED = (1<<31) + NLASTRIP_FLAG_TEMP_META = (1<<30), + NLASTRIP_FLAG_EDIT_TOUCHED = (1<<31) } eNlaStrip_Flag; /* NLA Strip Type */ @@ -651,7 +651,7 @@ typedef enum eNlaStrip_Type { /* 'transition' - blends between the adjacent strips */ NLASTRIP_TYPE_TRANSITION, /* 'meta' - a strip which acts as a container for a few others */ - NLASTRIP_TYPE_META, + NLASTRIP_TYPE_META, /* 'emit sound' - a strip which is used for timing when speaker emits sounds */ NLASTRIP_TYPE_SOUND @@ -827,71 +827,71 @@ typedef struct AnimOverride { * This datablock should be placed immediately after the ID block where it is used, so that * the code which retrieves this data can do so in an easier manner. See blenkernel/intern/anim_sys.c for details. */ -typedef struct AnimData { +typedef struct AnimData { /* active action - acts as the 'tweaking track' for the NLA */ - bAction *action; - /* temp-storage for the 'real' active action (i.e. the one used before the tweaking-action - * took over to be edited in the Animation Editors) + bAction *action; + /* temp-storage for the 'real' active action (i.e. the one used before the tweaking-action + * took over to be edited in the Animation Editors) */ - bAction *tmpact; - /* remapping-info for active action - should only be used if needed - * (for 'foreign' actions that aren't working correctly) + bAction *tmpact; + /* remapping-info for active action - should only be used if needed + * (for 'foreign' actions that aren't working correctly) */ - AnimMapper *remap; - + AnimMapper *remap; + /* nla-tracks */ - ListBase nla_tracks; + ListBase nla_tracks; /* active NLA-strip (only set/used during tweaking, so no need to worry about dangling pointers) */ - NlaStrip *actstrip; - - /* 'drivers' for this ID-block's settings - FCurves, but are completely - * separate from those for animation data + NlaStrip *actstrip; + + /* 'drivers' for this ID-block's settings - FCurves, but are completely + * separate from those for animation data */ - ListBase drivers; /* standard user-created Drivers/Expressions (used as part of a rig) */ - ListBase overrides; /* temp storage (AnimOverride) of values for settings that are animated (but the value hasn't been keyframed) */ - + ListBase drivers; /* standard user-created Drivers/Expressions (used as part of a rig) */ + ListBase overrides; /* temp storage (AnimOverride) of values for settings that are animated (but the value hasn't been keyframed) */ + /* settings for animation evaluation */ - int flag; /* user-defined settings */ - int recalc; /* depsgraph recalculation flags */ - + int flag; /* user-defined settings */ + int recalc; /* depsgraph recalculation flags */ + /* settings for active action evaluation (based on NLA strip settings) */ - short act_blendmode; /* accumulation mode for active action */ - short act_extendmode; /* extrapolation mode for active action */ - float act_influence; /* influence for active action */ + short act_blendmode; /* accumulation mode for active action */ + short act_extendmode; /* extrapolation mode for active action */ + float act_influence; /* influence for active action */ } AnimData; /* Animation Data settings (mostly for NLA) */ typedef enum eAnimData_Flag { /* only evaluate a single track in the NLA */ - ADT_NLA_SOLO_TRACK = (1<<0), + ADT_NLA_SOLO_TRACK = (1<<0), /* don't use NLA */ - ADT_NLA_EVAL_OFF = (1<<1), + ADT_NLA_EVAL_OFF = (1<<1), /* NLA is being 'tweaked' (i.e. in EditMode) */ - ADT_NLA_EDIT_ON = (1<<2), + ADT_NLA_EDIT_ON = (1<<2), /* active Action for 'tweaking' does not have mapping applied for editing */ - ADT_NLA_EDIT_NOMAP = (1<<3), + ADT_NLA_EDIT_NOMAP = (1<<3), /* NLA-Strip F-Curves are expanded in UI */ - ADT_NLA_SKEYS_COLLAPSED = (1<<4), - + ADT_NLA_SKEYS_COLLAPSED = (1<<4), + /* drivers expanded in UI */ - ADT_DRIVERS_COLLAPSED = (1<<10), + ADT_DRIVERS_COLLAPSED = (1<<10), /* don't execute drivers */ - ADT_DRIVERS_DISABLED = (1<<11), - + ADT_DRIVERS_DISABLED = (1<<11), + /* AnimData block is selected in UI */ - ADT_UI_SELECTED = (1<<14), + ADT_UI_SELECTED = (1<<14), /* AnimData block is active in UI */ - ADT_UI_ACTIVE = (1<<15), - + ADT_UI_ACTIVE = (1<<15), + /* F-Curves from this AnimData block are not visible in the Graph Editor */ - ADT_CURVES_NOT_VISIBLE = (1<<16) + ADT_CURVES_NOT_VISIBLE = (1<<16) } eAnimData_Flag; /* Animation Data recalculation settings (to be set by depsgraph) */ 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_DRIVERS = (1 << 0), + ADT_RECALC_ANIM = (1 << 1), + 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 0a20a60c893..fd68a6d9a27 100644 --- a/source/blender/makesdna/DNA_armature_types.h +++ b/source/blender/makesdna/DNA_armature_types.h @@ -45,91 +45,91 @@ struct AnimData; */ typedef struct Bone { - struct Bone *next, *prev; /* Next/prev elements within this list */ - IDProperty *prop; /* User-Defined Properties on this Bone */ - struct Bone *parent; /* Parent (ik parent if appropriate flag is set */ - ListBase childbase; /* Children */ - char name[64]; /* Name of the bone - must be unique within the armature, MAXBONENAME */ - - float roll; /* roll is input for editmode, length calculated */ - float head[3]; - float tail[3]; /* head/tail and roll in Bone Space */ - float bone_mat[3][3]; /* rotation derived from head/tail/roll */ - - int flag; - - float arm_head[3]; - float arm_tail[3]; /* head/tail in Armature Space (rest pos) */ - float arm_mat[4][4]; /* matrix: (bonemat(b)+head(b))*arm_mat(b-1), rest pos*/ - float arm_roll; /* roll in Armature Space (rest pos) */ - - float dist, weight; /* dist, weight: for non-deformgroup deforms */ - float xwidth, length, zwidth; /* width: for block bones. keep in this order, transform! */ - float ease1, ease2; /* length of bezier handles */ - float rad_head, rad_tail; /* radius for head/tail sphere, defining deform as well, parent->rad_tip overrides rad_head*/ - - float size[3]; /* patch for upward compat, UNUSED! */ - int layer; /* layers that bone appears on */ - short segments; /* for B-bones */ - short pad[1]; + struct Bone *next, *prev; /* Next/prev elements within this list */ + IDProperty *prop; /* User-Defined Properties on this Bone */ + struct Bone *parent; /* Parent (ik parent if appropriate flag is set */ + ListBase childbase; /* Children */ + char name[64]; /* Name of the bone - must be unique within the armature, MAXBONENAME */ + + float roll; /* roll is input for editmode, length calculated */ + float head[3]; + float tail[3]; /* head/tail and roll in Bone Space */ + float bone_mat[3][3]; /* rotation derived from head/tail/roll */ + + int flag; + + float arm_head[3]; + float arm_tail[3]; /* head/tail in Armature Space (rest pos) */ + float arm_mat[4][4]; /* matrix: (bonemat(b)+head(b))*arm_mat(b-1), rest pos*/ + float arm_roll; /* roll in Armature Space (rest pos) */ + + float dist, weight; /* dist, weight: for non-deformgroup deforms */ + float xwidth, length, zwidth; /* width: for block bones. keep in this order, transform! */ + float ease1, ease2; /* length of bezier handles */ + float rad_head, rad_tail; /* radius for head/tail sphere, defining deform as well, parent->rad_tip overrides rad_head */ + + float size[3]; /* patch for upward compat, UNUSED! */ + int layer; /* layers that bone appears on */ + short segments; /* for B-bones */ + short pad[1]; } Bone; typedef struct bArmature { - ID id; + ID id; struct AnimData *adt; - - ListBase bonebase; - ListBase chainbase; - ListBase *edbo; /* editbone listbase, we use pointer so we can check state */ - + + ListBase bonebase; + ListBase chainbase; + ListBase *edbo; /* editbone listbase, we use pointer so we can check state */ + /* active bones should work like active object where possible * - active and selection are unrelated - * - active & hidden is not allowed + * - active & hidden is not allowed * - from the user perspective active == last selected * - active should be ignored when not visible (hidden layer) */ - Bone *act_bone; /* active bone (when not in editmode) */ - void *act_edbone; /* active editbone (in editmode) */ - - void *sketch; /* sketch struct for etch-a-ton */ - - int flag; - int drawtype; - int gevertdeformer; /* how vertex deformation is handled in the ge */ - int pad; - short deformflag; - short pathflag; - - unsigned int layer_used; /* for UI, to show which layers are there */ - unsigned int layer, layer_protected; /* for buttons to work, both variables in this order together */ - + Bone *act_bone; /* active bone (when not in editmode) */ + void *act_edbone; /* active editbone (in editmode) */ + + void *sketch; /* sketch struct for etch-a-ton */ + + int flag; + int drawtype; + int gevertdeformer; /* how vertex deformation is handled in the ge */ + int pad; + short deformflag; + short pathflag; + + unsigned int layer_used; /* for UI, to show which layers are there */ + unsigned int layer, layer_protected; /* for buttons to work, both variables in this order together */ + // XXX deprecated... old animaton system (armature only viz) --- - short ghostep, ghostsize; /* number of frames to ghosts to show, and step between them */ - short ghosttype, pathsize; /* ghost drawing options and number of frames between points of path */ - int ghostsf, ghostef; /* start and end frames of ghost-drawing range */ - int pathsf, pathef; /* start and end frames of path-calculation range for all bones */ - int pathbc, pathac; /* number of frames before/after current frame of path-calculation for all bones */ + short ghostep, ghostsize; /* number of frames to ghosts to show, and step between them */ + short ghosttype, pathsize; /* ghost drawing options and number of frames between points of path */ + int ghostsf, ghostef; /* start and end frames of ghost-drawing range */ + int pathsf, pathef; /* start and end frames of path-calculation range for all bones */ + int pathbc, pathac; /* number of frames before/after current frame of path-calculation for all bones */ // XXX end of deprecated code ---------------------------------- } bArmature; /* armature->flag */ /* don't use bit 7, was saved in files to disable stuff */ typedef enum eArmature_Flag { - ARM_RESTPOS = (1<<0), - ARM_DRAWXRAY = (1<<1), /* XRAY is here only for backwards converting */ - ARM_DRAWAXES = (1<<2), - ARM_DRAWNAMES = (1<<3), - ARM_POSEMODE = (1<<4), - ARM_EDITMODE = (1<<5), - ARM_DELAYDEFORM = (1<<6), - ARM_DONT_USE = (1<<7), - ARM_MIRROR_EDIT = (1<<8), - ARM_AUTO_IK = (1<<9), - ARM_NO_CUSTOM = (1<<10), /* made option negative, for backwards compat */ - ARM_COL_CUSTOM = (1<<11), /* draw custom colors */ - ARM_GHOST_ONLYSEL = (1<<12), /* when ghosting, only show selected bones (this should belong to ghostflag instead) */ /* XXX deprecated */ - ARM_DS_EXPAND = (1<<13), /* dopesheet channel is expanded */ - ARM_HAS_VIZ_DEPS = (1<<14), /* other objects are used for visualizing various states (hack for efficient updates) */ + ARM_RESTPOS = (1<<0), + ARM_DRAWXRAY = (1<<1), /* XRAY is here only for backwards converting */ + ARM_DRAWAXES = (1<<2), + ARM_DRAWNAMES = (1<<3), + ARM_POSEMODE = (1<<4), + ARM_EDITMODE = (1<<5), + ARM_DELAYDEFORM = (1<<6), + ARM_DONT_USE = (1<<7), + ARM_MIRROR_EDIT = (1<<8), + ARM_AUTO_IK = (1<<9), + ARM_NO_CUSTOM = (1<<10), /* made option negative, for backwards compat */ + ARM_COL_CUSTOM = (1<<11), /* draw custom colors */ + ARM_GHOST_ONLYSEL = (1<<12), /* when ghosting, only show selected bones (this should belong to ghostflag instead) */ /* XXX deprecated */ + ARM_DS_EXPAND = (1<<13), /* dopesheet channel is expanded */ + ARM_HAS_VIZ_DEPS = (1<<14), /* other objects are used for visualizing various states (hack for efficient updates) */ } eArmature_Flag; /* armature->drawtype */ @@ -176,29 +176,29 @@ typedef enum eArmature_GhostType { /* bone->flag */ typedef enum eBone_Flag { - BONE_SELECTED = (1<<0), - BONE_ROOTSEL = (1<<1), - BONE_TIPSEL = (1<<2), - BONE_TRANSFORM = (1<<3), /* Used instead of BONE_SELECTED during transform */ - BONE_CONNECTED = (1<<4), /* when bone has a parent, connect head of bone to parent's tail*/ - /* 32 used to be quatrot, was always set in files, do not reuse unless you clear it always */ - BONE_HIDDEN_P = (1<<6), /* hidden Bones when drawing PoseChannels */ - BONE_DONE = (1<<7), /* For detecting cyclic dependencies */ - BONE_DRAW_ACTIVE = (1<<8), /* active is on mouse clicks only - deprecated, ONLY USE FOR DRAWING */ - BONE_HINGE = (1<<9), /* No parent rotation or scale */ - BONE_HIDDEN_A = (1<<10), /* hidden Bones when drawing Armature Editmode */ - BONE_MULT_VG_ENV = (1<<11), /* multiplies vgroup with envelope */ - BONE_NO_DEFORM = (1<<12), /* bone doesn't deform geometry */ - BONE_UNKEYED = (1<<13), /* set to prevent destruction of its unkeyframed pose (after transform) */ - BONE_HINGE_CHILD_TRANSFORM = (1<<14), /* set to prevent hinge child bones from influencing the transform center */ - BONE_NO_SCALE = (1<<15), /* No parent scale */ - BONE_HIDDEN_PG = (1<<16), /* hidden bone when drawing PoseChannels (for ghost drawing) */ - BONE_DRAWWIRE = (1<<17), /* bone should be drawn as OB_WIRE, regardless of draw-types of view+armature */ - BONE_NO_CYCLICOFFSET = (1<<18), /* when no parent, bone will not get cyclic offset */ - BONE_EDITMODE_LOCKED = (1<<19), /* bone transforms are locked in EditMode */ - BONE_TRANSFORM_CHILD = (1<<20), /* Indicates that a parent is also being transformed */ - BONE_UNSELECTABLE = (1<<21), /* bone cannot be selected */ - BONE_NO_LOCAL_LOCATION = (1<<22) /* bone location is in armature space */ + BONE_SELECTED = (1 << 0), + BONE_ROOTSEL = (1 << 1), + BONE_TIPSEL = (1 << 2), + BONE_TRANSFORM = (1 << 3), /* Used instead of BONE_SELECTED during transform */ + BONE_CONNECTED = (1 << 4), /* when bone has a parent, connect head of bone to parent's tail*/ + /* 32 used to be quatrot, was always set in files, do not reuse unless you clear it always */ + BONE_HIDDEN_P = (1 << 6), /* hidden Bones when drawing PoseChannels */ + BONE_DONE = (1 << 7), /* For detecting cyclic dependencies */ + BONE_DRAW_ACTIVE = (1 << 8), /* active is on mouse clicks only - deprecated, ONLY USE FOR DRAWING */ + BONE_HINGE = (1 << 9), /* No parent rotation or scale */ + BONE_HIDDEN_A = (1 << 10), /* hidden Bones when drawing Armature Editmode */ + BONE_MULT_VG_ENV = (1 << 11), /* multiplies vgroup with envelope */ + BONE_NO_DEFORM = (1 << 12), /* bone doesn't deform geometry */ + BONE_UNKEYED = (1 << 13), /* set to prevent destruction of its unkeyframed pose (after transform) */ + BONE_HINGE_CHILD_TRANSFORM = (1 << 14), /* set to prevent hinge child bones from influencing the transform center */ + BONE_NO_SCALE = (1 << 15), /* No parent scale */ + BONE_HIDDEN_PG = (1 << 16), /* hidden bone when drawing PoseChannels (for ghost drawing) */ + BONE_DRAWWIRE = (1 << 17), /* bone should be drawn as OB_WIRE, regardless of draw-types of view+armature */ + BONE_NO_CYCLICOFFSET = (1 << 18), /* when no parent, bone will not get cyclic offset */ + BONE_EDITMODE_LOCKED = (1 << 19), /* bone transforms are locked in EditMode */ + BONE_TRANSFORM_CHILD = (1 << 20), /* Indicates that a parent is also being transformed */ + BONE_UNSELECTABLE = (1 << 21), /* bone cannot be selected */ + BONE_NO_LOCAL_LOCATION = (1 << 22) /* bone location is in armature space */ } eBone_Flag; #define MAXBONENAME 64 diff --git a/source/blender/makesdna/DNA_boid_types.h b/source/blender/makesdna/DNA_boid_types.h index ce5fc4b0c3c..f1930ffd643 100644 --- a/source/blender/makesdna/DNA_boid_types.h +++ b/source/blender/makesdna/DNA_boid_types.h @@ -36,18 +36,18 @@ typedef enum BoidRuleType { eBoidRuleType_None = 0, - eBoidRuleType_Goal = 1, /* go to goal assigned object or loudest assigned signal source */ - eBoidRuleType_Avoid = 2, /* get away from assigned object or loudest assigned signal source */ - eBoidRuleType_AvoidCollision = 3, /* manoeuver to avoid collisions with other boids and deflector object in near future */ - eBoidRuleType_Separate = 4, /* keep from going through other boids */ - eBoidRuleType_Flock = 5, /* move to center of neighbors and match their velocity */ - eBoidRuleType_FollowLeader = 6, /* follow a boid or assigned object */ - eBoidRuleType_AverageSpeed = 7, /* maintain speed, flight level or wander*/ - eBoidRuleType_Fight = 8, /* go to closest enemy and attack when in range */ - //eBoidRuleType_Protect = 9, /* go to enemy closest to target and attack when in range */ - //eBoidRuleType_Hide = 10, /* find a deflector move to it's other side from closest enemy */ - //eBoidRuleType_FollowPath = 11, /* move along a assigned curve or closest curve in a group */ - //eBoidRuleType_FollowWall = 12, /* move next to a deflector object's in direction of it's tangent */ + eBoidRuleType_Goal = 1, /* go to goal assigned object or loudest assigned signal source */ + eBoidRuleType_Avoid = 2, /* get away from assigned object or loudest assigned signal source */ + eBoidRuleType_AvoidCollision = 3, /* manoeuver to avoid collisions with other boids and deflector object in near future */ + eBoidRuleType_Separate = 4, /* keep from going through other boids */ + eBoidRuleType_Flock = 5, /* move to center of neighbors and match their velocity */ + eBoidRuleType_FollowLeader = 6, /* follow a boid or assigned object */ + eBoidRuleType_AverageSpeed = 7, /* maintain speed, flight level or wander*/ + eBoidRuleType_Fight = 8, /* go to closest enemy and attack when in range */ + //eBoidRuleType_Protect = 9, /* go to enemy closest to target and attack when in range */ + //eBoidRuleType_Hide = 10, /* find a deflector move to it's other side from closest enemy */ + //eBoidRuleType_FollowPath = 11, /* move along a assigned curve or closest curve in a group */ + //eBoidRuleType_FollowWall = 12, /* move next to a deflector object's in direction of it's tangent */ NUM_BOID_RULE_TYPES } BoidRuleType; @@ -67,7 +67,7 @@ typedef struct BoidRuleGoalAvoid { BoidRule rule; struct Object *ob; int options; - float fear_factor; + float fear_factor; /* signals */ int signal_id, channels; diff --git a/source/blender/makesdna/DNA_cloth_types.h b/source/blender/makesdna/DNA_cloth_types.h index 4928a88b33e..df1cba6a44d 100644 --- a/source/blender/makesdna/DNA_cloth_types.h +++ b/source/blender/makesdna/DNA_cloth_types.h @@ -45,7 +45,7 @@ */ typedef struct ClothSimSettings { - struct LinkNode *cache; /* UNUSED atm */ + struct LinkNode *cache; /* UNUSED atm */ float mingoal; /* see SB */ float Cdis; /* Mechanical damping of springs. */ float Cvi; /* Viscous/fluid damping. */ diff --git a/source/blender/makesdna/DNA_constraint_types.h b/source/blender/makesdna/DNA_constraint_types.h index 8b1e7e12e17..f1b7a7c3cc3 100644 --- a/source/blender/makesdna/DNA_constraint_types.h +++ b/source/blender/makesdna/DNA_constraint_types.h @@ -170,7 +170,7 @@ typedef struct bSplineIKConstraint { short numpoints; /* number of points to bound in points array */ short chainlen; /* number of bones ('n') that are in the chain */ - /* settings */ + /* settings */ short flag; /* general settings for constraint */ short xzScaleMode; /* method used for determining the x & z scaling of the bones */ } bSplineIKConstraint; @@ -340,7 +340,7 @@ typedef struct bTransformConstraint { float from_max[3]; /* to map on to to_min/max range. */ float to_min[3]; /* range of motion on owner caused by target */ - float to_max[3]; + float to_max[3]; } bTransformConstraint; /* Pivot Constraint */ @@ -486,7 +486,7 @@ typedef enum eBConstraint_Flags { CONSTRAINT_EXPAND = (1<<0), /* pre-check for illegal object name or bone name */ CONSTRAINT_DISABLE = (1<<2), - /* to indicate which Ipo should be shown, maybe for 3d access later too */ + /* to indicate which Ipo should be shown, maybe for 3d access later too */ CONSTRAINT_ACTIVE = (1<<4), /* to indicate that the owner's space should only be changed into ownspace, but not out of it */ CONSTRAINT_SPACEONCE = (1<<6), @@ -664,7 +664,7 @@ typedef enum eSplineIK_Flags { /* bones in the chain should not scale to fit the curve */ CONSTRAINT_SPLINEIK_SCALE_LIMITED = (1<<2), /* evenly distribute the bones along the path regardless of length */ - CONSTRAINT_SPLINEIK_EVENSPLITS = (1<<3), + CONSTRAINT_SPLINEIK_EVENSPLITS = (1<<3), /* don't adjust the x and z scaling of the bones by the curve radius */ CONSTRAINT_SPLINEIK_NO_CURVERAD = (1<<4) } eSplineIK_Flags; @@ -751,7 +751,7 @@ typedef enum eChildOf_Flags { /* Restrictions for Pivot Constraint axis to consider for enabling constraint */ typedef enum ePivotConstraint_Axis { /* do not consider this activity-clamping */ - PIVOTCON_AXIS_NONE = -1, + PIVOTCON_AXIS_NONE = -1, /* consider -ve x-axis rotations */ PIVOTCON_AXIS_X_NEG = 0, diff --git a/source/blender/makesdna/DNA_curve_types.h b/source/blender/makesdna/DNA_curve_types.h index 9fbe045226e..3cf84648ea6 100644 --- a/source/blender/makesdna/DNA_curve_types.h +++ b/source/blender/makesdna/DNA_curve_types.h @@ -234,11 +234,11 @@ typedef struct Curve { float ctime; /* current evaltime - for use by Objects parented to curves */ int totbox, actbox; - struct TextBox *tb; + struct TextBox *tb; - int selstart, selend; + int selstart, selend; - struct CharInfo *strinfo; + struct CharInfo *strinfo; struct CharInfo curinfo; float bevfac1, bevfac2; diff --git a/source/blender/makesdna/DNA_gpencil_types.h b/source/blender/makesdna/DNA_gpencil_types.h index 71b344d23d7..100968e7257 100644 --- a/source/blender/makesdna/DNA_gpencil_types.h +++ b/source/blender/makesdna/DNA_gpencil_types.h @@ -39,7 +39,7 @@ * This assumes that the bottom-left corner is (0,0) */ typedef struct bGPDspoint { - float x, y, z; /* co-ordinates of point (usually 2d, but can be 3d as well) */ + float x, y, z; /* co-ordinates of point (usually 2d, but can be 3d as well) */ float pressure; /* pressure of input device (from 0 to 1) at this point */ } bGPDspoint; @@ -53,7 +53,7 @@ typedef struct bGPDstroke { bGPDspoint *points; /* array of data-points for stroke */ int totpoints; /* number of data-points in array */ - short thickness; /* thickness of stroke (currently not used) */ + short thickness; /* thickness of stroke (currently not used) */ short flag; /* various settings about this stroke */ } bGPDstroke; @@ -94,7 +94,7 @@ typedef struct bGPDlayer { ListBase frames; /* list of annotations to display for frames (bGPDframe list) */ bGPDframe *actframe; /* active frame (should be the frame that is currently being displayed) */ - int flag; /* settings for layer */ + int flag; /* settings for layer */ short thickness; /* current thickness to apply to strokes */ short gstep; /* max number of frames between active and ghost to show (0=only those on either side) */ diff --git a/source/blender/makesdna/DNA_ipo_types.h b/source/blender/makesdna/DNA_ipo_types.h index a73fc9073fa..3e641fba1ac 100644 --- a/source/blender/makesdna/DNA_ipo_types.h +++ b/source/blender/makesdna/DNA_ipo_types.h @@ -93,7 +93,7 @@ typedef struct Ipo { rctf cur; /* Rect defining extents of keyframes? */ short blocktype, showkey; /* blocktype: self-explanatory; showkey: either 0 or 1 (show vertical yellow lines for editing) */ - short muteipo, pad; /* muteipo: either 0 or 1 (whether ipo block is muted) */ + short muteipo, pad; /* muteipo: either 0 or 1 (whether ipo block is muted) */ } Ipo; /* ----------- adrcodes (for matching ipo-curves to data) ------------- */ diff --git a/source/blender/makesdna/DNA_lamp_types.h b/source/blender/makesdna/DNA_lamp_types.h index 4884db14c57..f36e65085c9 100644 --- a/source/blender/makesdna/DNA_lamp_types.h +++ b/source/blender/makesdna/DNA_lamp_types.h @@ -109,7 +109,7 @@ typedef struct Lamp { struct PreviewImage *preview; /* nodes */ - struct bNodeTree *nodetree; + struct bNodeTree *nodetree; } Lamp; /* **************** LAMP ********************* */ diff --git a/source/blender/makesdna/DNA_material_types.h b/source/blender/makesdna/DNA_material_types.h index 51f9af278fe..9a8d3bf981c 100644 --- a/source/blender/makesdna/DNA_material_types.h +++ b/source/blender/makesdna/DNA_material_types.h @@ -86,7 +86,7 @@ typedef struct Material { ID id; struct AnimData *adt; /* animation data (must be immediately after id for utilities to use it) */ - short material_type, flag; + short material_type, flag; /* note, keep this below synced with render_types.h */ float r, g, b; float specr, specg, specb; @@ -156,7 +156,7 @@ typedef struct Material { float rampfac_col, rampfac_spec; struct MTex *mtex[18]; /* MAX_MTEX */ - struct bNodeTree *nodetree; + struct bNodeTree *nodetree; struct Ipo *ipo DNA_DEPRECATED; /* old animation system, deprecated for 2.5 */ struct Group *group; /* light group */ struct PreviewImage *preview; diff --git a/source/blender/makesdna/DNA_meshdata_types.h b/source/blender/makesdna/DNA_meshdata_types.h index 7040bc72f18..0c193e9be21 100644 --- a/source/blender/makesdna/DNA_meshdata_types.h +++ b/source/blender/makesdna/DNA_meshdata_types.h @@ -72,7 +72,7 @@ typedef struct MVert { * at the moment alpha is abused for vertex painting * and not used for transparency, note that red and blue are swapped */ typedef struct MCol { - char a, r, g, b; + char a, r, g, b; } MCol; /* new face structure, replaces MFace, which is now diff --git a/source/blender/makesdna/DNA_meta_types.h b/source/blender/makesdna/DNA_meta_types.h index 2912650c77c..5b37ff523cb 100644 --- a/source/blender/makesdna/DNA_meta_types.h +++ b/source/blender/makesdna/DNA_meta_types.h @@ -93,7 +93,7 @@ typedef struct MetaBall { /* used in editmode */ /*ListBase edit_elems;*/ - MetaElem *lastelem; + MetaElem *lastelem; } MetaBall; /* **************** METABALL ********************* */ diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h index 99df51e9ec4..fe82d27cfa8 100644 --- a/source/blender/makesdna/DNA_modifier_types.h +++ b/source/blender/makesdna/DNA_modifier_types.h @@ -348,7 +348,7 @@ typedef struct UVProjectModifierData { int flags; int num_projectors; float aspectx, aspecty; - float scalex, scaley; + float scalex, scaley; char uvlayer_name[64]; /* MAX_CUSTOMDATA_LAYER_NAME */ int uvlayer_tmp, pad; } UVProjectModifierData; @@ -683,7 +683,7 @@ typedef struct SimpleDeformModifierData { struct Object *origin; /* object to control the origin of modifier space coordinates */ char vgroup_name[64]; /* optional vertexgroup name, MAX_VGROUP_NAME */ float factor; /* factors to control simple deforms */ - float limit[2]; /* lower and upper limit */ + float limit[2]; /* lower and upper limit */ char mode; /* deform function */ char axis; /* lock axis (for taper and strech) */ diff --git a/source/blender/makesdna/DNA_nla_types.h b/source/blender/makesdna/DNA_nla_types.h index 43b52ed65eb..5837f891ae0 100644 --- a/source/blender/makesdna/DNA_nla_types.h +++ b/source/blender/makesdna/DNA_nla_types.h @@ -50,7 +50,7 @@ typedef struct bActionModifier { /* path deform modifier */ short no_rot_axis; - struct Object *ob; + struct Object *ob; } bActionModifier; /* NLA-Modifier Types */ diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index 374b3ba1e53..8c0c42bb880 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -475,7 +475,7 @@ typedef struct RenderData { int color_mgt_flag; /** post-production settings. deprecated, but here for upwards compat (initialized to 1) */ - float postgamma, posthue, postsat; + float postgamma, posthue, postsat; /* Dither noise intensity */ float dither_intensity; @@ -1086,7 +1086,7 @@ typedef struct Scene { short use_nodes; - struct bNodeTree *nodetree; + struct bNodeTree *nodetree; struct Editing *ed; /* sequence editor data is allocated here */ diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h index 2469656ecd7..be6464778e5 100644 --- a/source/blender/makesdna/DNA_space_types.h +++ b/source/blender/makesdna/DNA_space_types.h @@ -792,10 +792,10 @@ typedef struct SpaceText { float blockscale DNA_DEPRECATED; short blockhandler[8] DNA_DEPRECATED; - struct Text *text; + struct Text *text; int top, viewlines; - short flags, menunr; + short flags, menunr; short lheight; /* user preference */ char cwidth, linenrs_tot; /* runtime computed, character width and the number of chars to use when showing line numbers */ diff --git a/source/blender/makesdna/DNA_texture_types.h b/source/blender/makesdna/DNA_texture_types.h index ce94a229750..dd63e6aad59 100644 --- a/source/blender/makesdna/DNA_texture_types.h +++ b/source/blender/makesdna/DNA_texture_types.h @@ -161,7 +161,7 @@ typedef struct PointDensity { float speed_scale, falloff_speed_scale, pdpad2; struct ColorBand *coba; /* for time -> color */ - struct CurveMapping *falloff_curve; /* falloff density curve */ + struct CurveMapping *falloff_curve; /* falloff density curve */ } PointDensity; typedef struct VoxelData { @@ -176,7 +176,7 @@ typedef struct VoxelData { int _pad; struct Object *object; /* for rendering smoke sims */ - float int_multiplier; + float int_multiplier; int still_frame; char source_path[1024]; /* 1024 = FILE_MAX */ diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index c10850d74e6..89b1208e800 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -184,7 +184,7 @@ typedef struct ThemeSpace { /* button/tool regions */ char button[4]; char button_title[4]; - char button_text[4]; + char button_text[4]; char button_text_hi[4]; /* listview regions */ @@ -195,8 +195,8 @@ typedef struct ThemeSpace { /* float panel */ char panel[4]; - char panel_title[4]; - char panel_text[4]; + char panel_title[4]; + char panel_text[4]; char panel_text_hi[4]; char shade1[4]; @@ -302,7 +302,7 @@ typedef struct bTheme { ThemeUI tui; /* Individual Spacetypes */ - ThemeSpace tbuts; + ThemeSpace tbuts; ThemeSpace tv3d; ThemeSpace tfile; ThemeSpace tipo; @@ -316,7 +316,7 @@ typedef struct bTheme { ThemeSpace ttime; ThemeSpace tnode; ThemeSpace tlogic; - ThemeSpace tuserpref; + ThemeSpace tuserpref; ThemeSpace tconsole; ThemeSpace tclip; diff --git a/source/blender/makesdna/DNA_view2d_types.h b/source/blender/makesdna/DNA_view2d_types.h index a3f4b362672..084496871bf 100644 --- a/source/blender/makesdna/DNA_view2d_types.h +++ b/source/blender/makesdna/DNA_view2d_types.h @@ -128,7 +128,7 @@ typedef struct View2D { #define V2D_SCROLL_HORIZONTAL (V2D_SCROLL_TOP|V2D_SCROLL_BOTTOM|V2D_SCROLL_BOTTOM_O) /* scale markings - vertical */ #define V2D_SCROLL_SCALE_VERTICAL (1<<5) - /* scale markings - horizontal */ + /* scale markings - horizontal */ #define V2D_SCROLL_SCALE_HORIZONTAL (1<<6) /* induce hiding of scrollbars - set by region drawing in response to size of region */ #define V2D_SCROLL_VERTICAL_HIDE (1<<7) diff --git a/source/blender/makesdna/DNA_world_types.h b/source/blender/makesdna/DNA_world_types.h index b3c10406d4c..8a14564f8a4 100644 --- a/source/blender/makesdna/DNA_world_types.h +++ b/source/blender/makesdna/DNA_world_types.h @@ -61,14 +61,14 @@ typedef struct World { float ambr, ambg, ambb; float pad2; - unsigned int fastcol; + unsigned int fastcol; /** * Exposure= mult factor. unused now, but maybe back later. Kept in to be upward compat. * New is exp/range control. linfac & logfac are constants... don't belong in * file, but allocating 8 bytes for temp mem isn't useful either. */ - float exposure, exp, range; + float exposure, exp, range; float linfac, logfac; /** @@ -129,7 +129,7 @@ typedef struct World { struct PreviewImage *preview; /* nodes */ - struct bNodeTree *nodetree; + struct bNodeTree *nodetree; } World; diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c index 674a7d7a2fe..72e34fe7228 100644 --- a/source/blender/makesdna/intern/makesdna.c +++ b/source/blender/makesdna/intern/makesdna.c @@ -87,14 +87,14 @@ static const char *includefiles[] = { "DNA_mesh_types.h", "DNA_meshdata_types.h", "DNA_modifier_types.h", - "DNA_lattice_types.h", + "DNA_lattice_types.h", "DNA_object_types.h", "DNA_object_force.h", "DNA_object_fluidsim.h", "DNA_world_types.h", "DNA_scene_types.h", "DNA_view3d_types.h", - "DNA_view2d_types.h", + "DNA_view2d_types.h", "DNA_space_types.h", "DNA_userdef_types.h", "DNA_screen_types.h", |