Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-06-17 18:04:09 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-06-17 18:04:09 +0300
commit78fbd146f3cd9a5c97307ff6f2d14422e7ae54b9 (patch)
tree62f1519be8e12353cc91f334414c478c015a5491 /source
parent4be752a93cf37700668c604296f37ea08248f13b (diff)
Cleanup: trailing space for DNA headers
Diffstat (limited to 'source')
-rw-r--r--source/blender/makesdna/DNA_ID.h2
-rw-r--r--source/blender/makesdna/DNA_action_types.h106
-rw-r--r--source/blender/makesdna/DNA_actuator_types.h20
-rw-r--r--source/blender/makesdna/DNA_anim_types.h140
-rw-r--r--source/blender/makesdna/DNA_armature_types.h8
-rw-r--r--source/blender/makesdna/DNA_boid_types.h2
-rw-r--r--source/blender/makesdna/DNA_camera_types.h6
-rw-r--r--source/blender/makesdna/DNA_cloth_types.h2
-rw-r--r--source/blender/makesdna/DNA_color_types.h8
-rw-r--r--source/blender/makesdna/DNA_constraint_types.h86
-rw-r--r--source/blender/makesdna/DNA_controller_types.h6
-rw-r--r--source/blender/makesdna/DNA_curve_types.h34
-rw-r--r--source/blender/makesdna/DNA_dynamicpaint_types.h2
-rw-r--r--source/blender/makesdna/DNA_effect_types.h28
-rw-r--r--source/blender/makesdna/DNA_gpencil_types.h44
-rw-r--r--source/blender/makesdna/DNA_group_types.h2
-rw-r--r--source/blender/makesdna/DNA_image_types.h14
-rw-r--r--source/blender/makesdna/DNA_ipo_types.h20
-rw-r--r--source/blender/makesdna/DNA_key_types.h6
-rw-r--r--source/blender/makesdna/DNA_lamp_types.h22
-rw-r--r--source/blender/makesdna/DNA_lattice_types.h10
-rw-r--r--source/blender/makesdna/DNA_material_types.h26
-rw-r--r--source/blender/makesdna/DNA_mesh_types.h4
-rw-r--r--source/blender/makesdna/DNA_meshdata_types.h2
-rw-r--r--source/blender/makesdna/DNA_meta_types.h14
-rw-r--r--source/blender/makesdna/DNA_modifier_types.h6
-rw-r--r--source/blender/makesdna/DNA_nla_types.h8
-rw-r--r--source/blender/makesdna/DNA_node_types.h74
-rw-r--r--source/blender/makesdna/DNA_object_fluidsim_types.h12
-rw-r--r--source/blender/makesdna/DNA_object_force_types.h30
-rw-r--r--source/blender/makesdna/DNA_object_types.h34
-rw-r--r--source/blender/makesdna/DNA_particle_types.h8
-rw-r--r--source/blender/makesdna/DNA_property_types.h2
-rw-r--r--source/blender/makesdna/DNA_rigidbody_types.h34
-rw-r--r--source/blender/makesdna/DNA_scene_types.h130
-rw-r--r--source/blender/makesdna/DNA_screen_types.h26
-rw-r--r--source/blender/makesdna/DNA_sensor_types.h6
-rw-r--r--source/blender/makesdna/DNA_sequence_types.h6
-rw-r--r--source/blender/makesdna/DNA_smoke_types.h2
-rw-r--r--source/blender/makesdna/DNA_speaker_types.h2
-rw-r--r--source/blender/makesdna/DNA_text_types.h6
-rw-r--r--source/blender/makesdna/DNA_texture_types.h58
-rw-r--r--source/blender/makesdna/DNA_userdef_types.h108
-rw-r--r--source/blender/makesdna/DNA_vfont_types.h4
-rw-r--r--source/blender/makesdna/DNA_view2d_types.h12
-rw-r--r--source/blender/makesdna/DNA_view3d_types.h18
-rw-r--r--source/blender/makesdna/DNA_windowmanager_types.h2
-rw-r--r--source/blender/makesdna/DNA_world_types.h26
-rw-r--r--source/blender/makesdna/intern/dna_genfile.c142
-rw-r--r--source/blender/makesdna/intern/makesdna.c166
50 files changed, 768 insertions, 768 deletions
diff --git a/source/blender/makesdna/DNA_ID.h b/source/blender/makesdna/DNA_ID.h
index c632b87752b..0c7341b0fae 100644
--- a/source/blender/makesdna/DNA_ID.h
+++ b/source/blender/makesdna/DNA_ID.h
@@ -153,7 +153,7 @@ typedef struct Library {
char filepath[1024];
struct Library *parent; /* set for indirectly linked libs, used in the outliner and while reading */
-
+
struct PackedFile *packedfile;
/* Temp data needed by read/write code. */
diff --git a/source/blender/makesdna/DNA_action_types.h b/source/blender/makesdna/DNA_action_types.h
index 0e13aff4d44..e255b85ebe3 100644
--- a/source/blender/makesdna/DNA_action_types.h
+++ b/source/blender/makesdna/DNA_action_types.h
@@ -72,10 +72,10 @@ typedef enum eMotionPathVert_Flag {
typedef struct bMotionPath {
bMotionPathVert *points; /* path samples */
int length; /* the number of cached verts */
-
+
int start_frame; /* for drawing paths, the start frame number */
int end_frame; /* for drawing paths, the end frame number */
-
+
float color[3]; /* optional custom color */
int line_thickness; /* line thickness */
int flag; /* baking settings - eMotionPath_Flag */
@@ -90,7 +90,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 --------------------------- */
@@ -101,22 +101,22 @@ typedef struct bAnimVizSettings {
/* Onion-Skinning Settings ----------------- */
int ghost_sf, ghost_ef; /* start and end frames of ghost-drawing range (only used for GHOST_TYPE_RANGE) */
int ghost_bc, ghost_ac; /* number of frames before/after current frame to show */
-
+
short ghost_type; /* eOnionSkin_Types */
short ghost_step; /* number of frames between each ghost shown (not for GHOST_TYPE_KEYS) */
-
+
short ghost_flag; /* eOnionSkin_Flag */
-
+
/* General Settings ------------------------ */
short recalc; /* eAnimViz_RecalcFlags */
-
+
/* Motion Path Settings ------------------- */
short path_type; /* eMotionPath_Types */
short path_step; /* number of frames between points indicated on the paths */
-
+
short path_viewflag; /* eMotionPaths_ViewFlag */
short path_bakeflag; /* eMotionPaths_BakeFlag */
-
+
int path_sf, path_ef; /* start and end frames of path-calculation range */
int path_bc, path_ac; /* number of frames before/after current frame to show */
} bAnimVizSettings;
@@ -185,19 +185,19 @@ typedef enum eMotionPaths_BakeFlag {
/* PoseChannel ------------------------------------ */
-/* PoseChannel
+/* PoseChannel
*
* A PoseChannel stores the results of Actions and transform information
* with respect to the restposition of Armature bones
*/
typedef struct bPoseChannel {
struct bPoseChannel *next, *prev;
-
+
IDProperty *prop; /* User-Defined Properties on this PoseChannel */
-
+
ListBase constraints; /* Constraints that act on this PoseChannel */
char name[64]; /* need to match bone name length: MAXBONENAME */
-
+
short flag; /* dynamic, for detecting transform changes */
short ikflag; /* settings for IK bones */
short protectflag; /* protect channels from being transformed */
@@ -234,32 +234,32 @@ typedef struct bPoseChannel {
float rotAxis[3], rotAngle; /* axis-angle rotation */
short rotmode; /* eRotationModes - rotation representation to use */
short pad;
-
+
float chan_mat[4][4]; /* matrix result of loc/quat/size, and where we put deform in, see next line */
float pose_mat[4][4]; /* constraints accumulate here. in the end, pose_mat = bone->arm_mat * chan_mat
* this matrix is object space */
float constinv[4][4]; /* inverse result of constraints.
* doesn't include effect of restposition, parent, and local transform*/
-
+
float pose_head[3]; /* actually pose_mat[3] */
float pose_tail[3]; /* also used for drawing help lines... */
-
+
float limitmin[3], limitmax[3]; /* DOF constraint, note! - these are stored in degrees, not radians */
float stiffness[3]; /* DOF stiffness */
float ikstretch;
float ikrotweight; /* weight of joint rotation constraint */
float iklinweight; /* weight of joint stretch constraint */
-
+
/* curved bones settings - these are for animating, and are applied on top of the copies in pchan->bone */
float roll1, roll2;
float curveInX, curveInY;
float curveOutX, curveOutY;
float ease1, ease2;
float scaleIn, scaleOut;
-
+
struct bPoseChannel *bbone_prev; /* next/prev bones to use as handle references when calculating bbones (optional) */
struct bPoseChannel *bbone_next;
-
+
void *temp; /* use for outliner */
} bPoseChannel;
@@ -270,16 +270,16 @@ typedef enum ePchan_Flag {
POSE_LOC = (1 << 0),
POSE_ROT = (1 << 1),
POSE_SIZE = (1 << 2),
-
+
/* old IK/cache stuff
- * - used to be here from (1 << 3) to (1 << 8)
+ * - used to be here from (1 << 3) to (1 << 8)
* but has been repurposed since 2.77.2
* as they haven't been used in over 10 years
*/
-
+
/* has BBone deforms */
POSE_BBONE_SHAPE = (1 << 3),
-
+
/* IK/Pose solving */
POSE_CHAIN = (1 << 9),
POSE_DONE = (1 << 10),
@@ -357,8 +357,8 @@ typedef enum eRotationModes {
ROT_MODE_YZX = 4,
ROT_MODE_ZXY = 5,
ROT_MODE_ZYX = 6,
- /* NOTE: space is reserved here for 18 other possible
- * euler rotation orders not implemented
+ /* NOTE: space is reserved here for 18 other possible
+ * euler rotation orders not implemented
*/
/* axis angle rotations */
ROT_MODE_AXISANGLE = -1,
@@ -369,7 +369,7 @@ typedef enum eRotationModes {
/* Pose ------------------------------------ */
-/* Pose-Object.
+/* Pose-Object.
*
* It is only found under ob->pose. It is not library data, even
* though there is a define for it (hack for the outliner).
@@ -386,19 +386,19 @@ typedef struct bPose {
short flag, pad;
unsigned int proxy_layer; /* proxy layer: copy from armature, gets synced */
int pad1;
-
+
float ctime; /* local action time of this pose */
float stride_offset[3]; /* applied to object */
float cyclic_offset[3]; /* result of match and cycles, applied in BKE_pose_where_is() */
-
-
+
+
ListBase agroups; /* list of bActionGroups */
-
+
int active_group; /* index of active group (starts from 1) */
int iksolver; /* ik solver to use, see ePose_IKSolverType */
void *ikdata; /* temporary IK data, depends on the IK solver. Not saved in file */
void *ikparam; /* IK solver parameters, structure depends on iksolver */
-
+
bAnimVizSettings avs; /* settings for visualization of bone animation */
char proxy_act_bone[64]; /* proxy active bone name, MAXBONENAME */
} bPose;
@@ -489,13 +489,13 @@ typedef enum eItasc_Solver {
*/
typedef struct bActionGroup {
struct bActionGroup *next, *prev;
-
+
ListBase channels; /* Note: this must not be touched by standard listbase functions which would clear links to other channels */
-
+
int flag; /* settings for this action-group */
int customCol; /* index of custom color set to use when used for bones (0=default - used for all old files, -1=custom set) */
char name[64]; /* name of the group */
-
+
ThemeWireColor cs; /* color set to use when customCol == -1 */
} bActionGroup;
@@ -518,7 +518,7 @@ typedef enum eActionGroup_Flag {
/* sub channel modifiers off */
AGRP_MODIFIERS_OFF = (1 << 7),
-
+
AGRP_TEMP = (1 << 30),
AGRP_MOVED = (1u << 31)
} eActionGroup_Flag;
@@ -526,7 +526,7 @@ typedef enum eActionGroup_Flag {
/* Actions -------------------------------------- */
-/* Action - reusable F-Curve 'bag' (act)
+/* Action - reusable F-Curve 'bag' (act)
*
* This contains F-Curves that may affect settings from more than one ID blocktype and/or
* datablock (i.e. sub-data linked/used directly to the ID block that the animation data is linked to),
@@ -538,15 +538,15 @@ typedef enum eActionGroup_Flag {
*/
typedef struct bAction {
ID id; /* ID-serialisation for relinking */
-
+
ListBase curves; /* function-curves (FCurve) */
ListBase chanbase DNA_DEPRECATED; /* legacy data - Action Channels (bActionChannel) in pre-2.5 animation system */
ListBase groups; /* groups of function-curves (bActionGroup) */
ListBase markers; /* markers local to the Action (used to provide Pose-Libraries) */
-
+
int flag; /* settings for this action */
int active_marker; /* index of the active marker */
-
+
int idroot; /* type of ID-blocks that action can be assigned to (if 0, will be set to whatever ID first evaluates it) */
int pad;
} bAction;
@@ -572,13 +572,13 @@ typedef enum eAction_Flags {
typedef struct bDopeSheet {
ID *source; /* currently ID_SCE (for Dopesheet), and ID_SC (for Grease Pencil) */
ListBase chanbase; /* cache for channels (only initialized when pinned) */ // XXX not used!
-
+
struct Group *filter_grp; /* object group for ADS_FILTER_ONLYOBGROUP filtering option */
char searchstr[64]; /* string to search for in displayed names of F-Curves for ADS_FILTER_BY_FCU_NAME filtering option */
-
+
int filterflag; /* flags to use for filtering data */
int flag; /* standard flags */
-
+
int renameIndex; /* index+1 of channel to rename - only gets set by renaming operator */
int pad;
} bDopeSheet;
@@ -588,7 +588,7 @@ typedef struct bDopeSheet {
typedef enum eDopeSheet_FilterFlag {
/* general filtering */
ADS_FILTER_ONLYSEL = (1 << 0), /* only include channels relating to selected data */
-
+
/* temporary filters */
ADS_FILTER_ONLYDRIVERS = (1 << 1), /* for 'Drivers' editor - only include Driver data from AnimData */
ADS_FILTER_ONLYNLA = (1 << 2), /* for 'NLA' editor - only include NLA data from AnimData */
@@ -627,22 +627,22 @@ typedef enum eDopeSheet_FilterFlag {
ADS_FILTER_INCL_HIDDEN = (1 << 26), /* include 'hidden' channels too (i.e. those from hidden Objects/Bones) */
ADS_FILTER_BY_FCU_NAME = (1 << 27), /* for F-Curves, filter by the displayed name (i.e. to isolate all Location curves only) */
ADS_FILTER_ONLY_ERRORS = (1 << 28), /* show only F-Curves which are disabled/have errors - for debugging drivers */
-
+
/* GPencil Mode */
ADS_FILTER_GP_3DONLY = (1 << 29), /* GP Mode - Only show datablocks used in the scene */
-
+
/* 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)
-} eDopeSheet_FilterFlag;
+} eDopeSheet_FilterFlag;
/* DopeSheet general flags */
typedef enum eDopeSheet_Flag {
ADS_FLAG_SUMMARY_COLLAPSED = (1 << 0), /* when summary is shown, it is collapsed, so all other channels get hidden */
ADS_FLAG_SHOW_DBFILTERS = (1 << 1), /* show filters for datablocks */
-
+
ADS_FLAG_FUZZY_NAMES = (1 << 2), /* use fuzzy/partial string matches when ADS_FILTER_BY_FCU_NAME is enabled (WARNING: expensive operation) */
ADS_FLAG_NO_DB_SORT = (1 << 3), /* do not sort datablocks (mostly objects) by name (NOTE: potentially expensive operation) */
-
+
/* NOTE: datablock filter flags continued (1 << 10) onwards... */
} eDopeSheet_Flag;
@@ -658,10 +658,10 @@ typedef struct SpaceAction {
/* End 'SpaceLink' header. */
View2D v2d DNA_DEPRECATED; /* copied to region */
-
+
bAction *action; /* the currently active action */
bDopeSheet ads; /* the currently active context (when not showing action) */
-
+
char mode, autosnap; /* mode: editing context; autosnap: automatic keyframe snapping mode */
short flag; /* flag: bitmapped settings; */
float timeslide; /* for Time-Slide transform mode drawing - current frame? */
@@ -693,7 +693,7 @@ typedef enum eSAction_Flag {
SACTION_NOREALTIMEUPDATES = (1 << 10),
/* move markers as well as keyframes */
SACTION_MARKERS_MOVE = (1 << 11)
-} eSAction_Flag;
+} eSAction_Flag;
/* SpaceAction Mode Settings */
typedef enum eAnimEdit_Context {
@@ -745,10 +745,10 @@ typedef enum eAnimEdit_AutoSnap {
typedef struct bActionChannel {
struct bActionChannel *next, *prev;
bActionGroup *grp; /* Action Group this Action Channel belongs to */
-
+
struct Ipo *ipo; /* IPO block this action channel references */
ListBase constraintChannels; /* Constraint Channels (when Action Channel represents an Object or Bone) */
-
+
int flag; /* settings accessed via bitmapping */
char name[64]; /* channel name, MAX_NAME */
int temp; /* temporary setting - may be used to indicate group that channel belongs to during syncing */
diff --git a/source/blender/makesdna/DNA_actuator_types.h b/source/blender/makesdna/DNA_actuator_types.h
index 6bdea21da1e..6461ad5445f 100644
--- a/source/blender/makesdna/DNA_actuator_types.h
+++ b/source/blender/makesdna/DNA_actuator_types.h
@@ -130,9 +130,9 @@ typedef struct bIpoActuator {
float sta, end;
char name[64]; /* MAX_NAME */
char frameProp[64]; /* Set this property to the actions current frame, MAX_NAME */
-
+
short pad1, pad2, pad3, pad4;
-
+
} bIpoActuator;
typedef struct bCameraActuator {
@@ -157,10 +157,10 @@ typedef struct bGroupActuator {
short flag, type;
int sta, end;
char name[64]; /* property or groupkey, MAX_NAME */
-
+
short pad[3], cur, butsta, butend;/* not referenced, can remove? */
/* struct Group *group; not used, remove */
-
+
} bGroupActuator;
/* I added a few extra fields here, to facilitate conversions */
@@ -191,8 +191,8 @@ typedef struct bGameActuator {
} bGameActuator;
typedef struct bVisibilityActuator {
- /** bit 0: Is this object visible?
- ** bit 1: Apply recursively
+ /** bit 0: Is this object visible?
+ ** bit 1: Apply recursively
** bit 2: Is this object an occluder? */
int flag;
} bVisibilityActuator;
@@ -263,7 +263,7 @@ typedef struct bActuator {
struct bActuator *next, *prev, *mynew;
short type;
/**
- * Tells what type of actuator data \ref data holds.
+ * Tells what type of actuator data \ref data holds.
*/
short flag;
short otype, go;
@@ -334,8 +334,8 @@ typedef struct bActuator {
#define ACT_SHOW 1
#define ACT_DEL 2
#define ACT_NEW 4
-#define ACT_LINKED 8
-#define ACT_VISIBLE 16
+#define ACT_LINKED 8
+#define ACT_VISIBLE 16
#define ACT_PIN 32
#define ACT_DEACTIVATE 64
@@ -378,7 +378,7 @@ typedef struct bActuator {
#define ACT_IPOFORCE (1 << 0)
#define ACT_IPOEND (1 << 1)
#define ACT_IPOLOCAL (1 << 2)
-#define ACT_IPOCHILD (1 << 4)
+#define ACT_IPOCHILD (1 << 4)
#define ACT_IPOADD (1 << 5)
/* property actuator->type */
diff --git a/source/blender/makesdna/DNA_anim_types.h b/source/blender/makesdna/DNA_anim_types.h
index f5260319eff..d0a21b50d45 100644
--- a/source/blender/makesdna/DNA_anim_types.h
+++ b/source/blender/makesdna/DNA_anim_types.h
@@ -44,30 +44,30 @@ extern "C" {
/* Modifiers -------------------------------------- */
-/* F-Curve Modifiers (fcm)
+/* F-Curve Modifiers (fcm)
*
* These alter the way F-Curves behave, by altering the value that is returned
* when evaluating the curve's data at some time (t).
*/
typedef struct FModifier {
struct FModifier *next, *prev;
-
+
struct FCurve *curve; /* containing curve, only used for updates to CYCLES */
void *data; /* pointer to modifier data */
-
+
char name[64]; /* user-defined description for the modifier - MAX_ID_NAME-2 */
short type; /* type of f-curve modifier */
short flag; /* settings for the modifier */
-
+
float influence; /* the amount that the modifier should influence the value */
-
+
float sfra; /* start frame of restricted frame-range */
float efra; /* end frame of restricted frame-range */
float blendin; /* number of frames from sfra before modifier takes full influence */
float blendout; /* number of frames from efra before modifier fades out */
} FModifier;
-/* Types of F-Curve modifier
+/* Types of F-Curve modifier
* WARNING: order here is important!
*/
typedef enum eFModifier_Types {
@@ -81,7 +81,7 @@ typedef enum eFModifier_Types {
FMODIFIER_TYPE_PYTHON = 7,
FMODIFIER_TYPE_LIMITS = 8,
FMODIFIER_TYPE_STEPPED = 9,
-
+
/* NOTE: all new modifiers must be added above this line */
FMODIFIER_NUM_TYPES
} eFModifier_Types;
@@ -100,7 +100,7 @@ typedef enum eFModifier_Flags {
FMODIFIER_FLAG_RANGERESTRICT = (1<<4),
/* use influence control */
FMODIFIER_FLAG_USEINFLUENCE = (1<<5)
-} eFModifier_Flags;
+} eFModifier_Flags;
/* --- */
@@ -109,10 +109,10 @@ typedef struct FMod_Generator {
/* general generator information */
float *coefficients; /* coefficients array */
unsigned int arraysize; /* size of the coefficients array */
-
+
int poly_order; /* order of polynomial generated (i.e. 1 for linear, 2 for quadratic) */
int mode; /* which 'generator' to use eFMod_Generator_Modes */
-
+
/* settings */
int flag; /* settings */
} FMod_Generator;
@@ -124,7 +124,7 @@ typedef enum eFMod_Generator_Modes {
} eFMod_Generator_Modes;
-/* generator flags
+/* generator flags
* - shared by Generator and Function Generator
*/
typedef enum eFMod_Generator_Flags {
@@ -147,7 +147,7 @@ typedef struct FMod_FunctionGenerator {
float phase_multiplier;
float phase_offset;
float value_offset;
-
+
/* flags */
int type; /* eFMod_Generator_Functions */
int flag; /* eFMod_Generator_flags */
@@ -168,7 +168,7 @@ typedef enum eFMod_Generator_Functions {
typedef struct FCM_EnvelopeData {
float min, max; /* min/max values for envelope at this point (absolute values) */
float time; /* time for that this sample-point occurs */
-
+
short f1; /* settings for 'min' control point */
short f2; /* settings for 'max' control point */
} FCM_EnvelopeData;
@@ -177,7 +177,7 @@ typedef struct FCM_EnvelopeData {
typedef struct FMod_Envelope {
FCM_EnvelopeData *data; /* data-points defining envelope to apply (array) */
int totvert; /* number of envelope points */
-
+
float midval; /* value that envelope's influence is centered around / based on */
float min, max; /* distances from 'middle-value' for 1:1 envelope influence */
} FMod_Envelope;
@@ -230,11 +230,11 @@ typedef struct FMod_Noise {
float strength;
float phase;
float offset;
-
+
short depth;
short modification;
} FMod_Noise;
-
+
/* modification modes */
typedef enum eFMod_Noise_Modifications {
FCM_NOISE_MODIF_REPLACE = 0, /* Modify existing curve, matching it's shape */
@@ -269,31 +269,31 @@ typedef enum eFMod_Stepped_Flags {
*/
typedef struct DriverTarget {
ID *id; /* ID-block which owns the target, no user count */
-
+
char *rna_path; /* RNA path defining the setting to use (for DVAR_TYPE_SINGLE_PROP) */
-
+
char pchan_name[64]; /* name of the posebone to use (for vars where DTAR_FLAG_STRUCT_REF is used) - MAX_ID_NAME-2 */
short transChan; /* transform channel index (for DVAR_TYPE_TRANSFORM_CHAN)*/
-
+
short flag; /* flags for the validity of the target (NOTE: these get reset every time the types change) */
int idtype; /* type of ID-block that this target can use */
} DriverTarget;
/* Driver Target flags */
typedef enum eDriverTarget_Flag {
- /* used for targets that use the pchan_name instead of RNA path
- * (i.e. rotation difference)
+ /* used for targets that use the pchan_name instead of RNA path
+ * (i.e. rotation difference)
*/
DTAR_FLAG_STRUCT_REF = (1 << 0),
/* idtype can only be 'Object' */
DTAR_FLAG_ID_OB_ONLY = (1 << 1),
-
+
/* "localspace" flags */
/* base flag - basically "pre parent+constraints" */
DTAR_FLAG_LOCALSPACE = (1 << 2),
/* include constraints transformed to space including parents */
DTAR_FLAG_LOCAL_CONSTS = (1 << 3),
-
+
/* error flags */
DTAR_FLAG_INVALID = (1 << 4),
} eDriverTarget_Flag;
@@ -309,7 +309,7 @@ typedef enum eDriverTarget_TransformChannels {
DTAR_TRANSCHAN_SCALEX,
DTAR_TRANSCHAN_SCALEY,
DTAR_TRANSCHAN_SCALEZ,
-
+
MAX_DTAR_TRANSCHAN_TYPES
} eDriverTarget_TransformChannels;
@@ -328,14 +328,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) - MAX_ID_NAME-2 */
-
+
DriverTarget targets[8]; /* MAX_DRIVER_TARGETS, target slots */
-
+
char num_targets; /* number of targets actually used by this variable */
char type; /* type of driver variable (eDriverVar_Types) */
-
+
short flag; /* validation tags, etc. (eDriverVar_Flags) */
float curval; /* result of previous evaluation */
} DriverVar;
@@ -350,8 +350,8 @@ typedef enum eDriverVar_Types {
DVAR_TYPE_LOC_DIFF,
/* 'final' transform for object/bones */
DVAR_TYPE_TRANSFORM_CHAN,
-
- /* maximum number of variable types
+
+ /* maximum number of variable types
* NOTE: this must always be th last item in this list,
* so add new types above this line
*/
@@ -362,7 +362,7 @@ typedef enum eDriverVar_Types {
typedef enum eDriverVar_Flags {
/* variable is not set up correctly */
DVAR_FLAG_ERROR = (1 << 0),
-
+
/* variable name doesn't pass the validation tests */
DVAR_FLAG_INVALID_NAME = (1 << 1),
/* name starts with a number */
@@ -408,16 +408,16 @@ typedef enum eDriverVar_Flags {
*/
typedef struct ChannelDriver {
ListBase variables; /* targets for this driver (i.e. list of DriverVar) */
-
- /* python expression to execute (may call functions defined in an accessory file)
+
+ /* python expression to execute (may call functions defined in an accessory file)
* which relates the target 'variables' in some way to yield a single usable value
*/
char expression[256]; /* expression to compile for evaluation */
void *expr_comp; /* PyObject - compiled expression, don't save this */
-
+
float curval; /* result of previous evaluation */
float influence; /* influence of driver on result */ // XXX to be implemented... this is like the constraint influence setting
-
+
/* general settings */
int type; /* type of driver */
int flag; /* settings of driver */
@@ -472,32 +472,32 @@ typedef struct FPoint {
/* 'Function-Curve' - defines values over time for a given setting (fcu) */
typedef struct FCurve {
struct FCurve *next, *prev;
-
+
/* group */
bActionGroup *grp; /* group that F-Curve belongs to */
-
+
/* driver settings */
ChannelDriver *driver; /* only valid for drivers (i.e. stored in AnimData not Actions) */
/* evaluation settings */
ListBase modifiers; /* FCurve Modifiers */
-
+
/* motion data */
BezTriple *bezt; /* user-editable keyframes (array) */
FPoint *fpt; /* 'baked/imported' motion samples (array) */
unsigned int totvert; /* total number of points which define the curve (i.e. size of arrays in FPoints) */
-
+
/* value cache + settings */
float curval; /* value stored from last time curve was evaluated (not threadsafe, debug display only!) */
short flag; /* user-editable settings for this curve */
short extend; /* value-extending mode for this curve (does not cover */
char auto_smoothing; /* auto-handle smoothing mode */
-
+
char pad[7];
/* RNA - data link */
int array_index; /* if applicable, the index of the RNA-array item to get */
char *rna_path; /* RNA-path to resolve data-access */
-
+
/* curve coloring (for editor) */
int color_mode; /* coloring method to use (eFCurve_Coloring) */
float color[3]; /* the last-color this curve took */
@@ -518,7 +518,7 @@ typedef enum eFCurve_Flags {
FCURVE_PROTECTED = (1<<3),
/* fcurve will not be evaluated for the next round */
FCURVE_MUTED = (1<<4),
-
+
/* fcurve uses 'auto-handles', which stay horizontal... */
// DEPRECATED
FCURVE_AUTO_HANDLES = (1<<5),
@@ -529,7 +529,7 @@ typedef enum eFCurve_Flags {
FCURVE_INT_VALUES = (1<<11),
/* curve can only have certain discrete-number values (no interpolation at all, for enums/booleans) */
FCURVE_DISCRETE_VALUES = (1<<12),
-
+
/* temporary tag for editing */
FCURVE_TAGGED = (1<<15)
} eFCurve_Flags;
@@ -561,7 +561,7 @@ typedef enum eFCurve_Smoothing {
* they are not stored here... see DNA_action_types.h instead
*/
-
+
/* ************************************************ */
/* Animation Reuse - i.e. users of Actions */
@@ -580,7 +580,7 @@ typedef struct AnimMapPair {
char to[128]; /* part of path to replace with */
} AnimMapPair;
-/* Retargetting Information for Actions
+/* Retargetting Information for Actions
*
* This should only be used if it is strictly necessary (i.e. user will need to explicitly
* add this when they find that some channels do not match, or motion is not going to right
@@ -593,7 +593,7 @@ typedef struct AnimMapPair {
// such consequences...
typedef struct AnimMapper {
struct AnimMapper *next, *prev;
-
+
bAction *target; /* target action */
ListBase mappings; /* remapping table (bAnimMapPair) */
} AnimMapper;
@@ -699,14 +699,14 @@ typedef enum eNlaStrip_Flag {
} eNlaStrip_Flag;
/* NLA Strip Type */
-typedef enum eNlaStrip_Type {
+typedef enum eNlaStrip_Type {
/* 'clip' - references an Action */
NLASTRIP_TYPE_CLIP = 0,
/* 'transition' - blends between the adjacent strips */
NLASTRIP_TYPE_TRANSITION,
/* 'meta' - a strip which acts as a container for a few others */
NLASTRIP_TYPE_META,
-
+
/* 'emit sound' - a strip which is used for timing when speaker emits sounds */
NLASTRIP_TYPE_SOUND
} eNlaStrip_Type;
@@ -722,12 +722,12 @@ typedef enum eNlaStrip_Type {
*/
typedef struct NlaTrack {
struct NlaTrack *next, *prev;
-
+
ListBase strips; /* bActionStrips in this track */
-
+
int flag; /* settings for this track */
int index; /* index of the track in the stack (NOTE: not really useful, but we need a pad var anyways!) */
-
+
char name[64]; /* short user-description of this track - MAX_ID_NAME-2 */
} NlaTrack;
@@ -743,7 +743,7 @@ typedef enum eNlaTrack_Flag {
NLATRACK_SOLO = (1<<3),
/* track's settings (and strips) cannot be edited (to guard against unwanted changes) */
NLATRACK_PROTECTED = (1<<4),
-
+
/* track is not allowed to execute, usually as result of tweaking being enabled (internal flag) */
NLATRACK_DISABLED = (1<<10)
} eNlaTrack_Flag;
@@ -752,7 +752,7 @@ typedef enum eNlaTrack_Flag {
/* ************************************ */
/* KeyingSet Datatypes */
-/* Path for use in KeyingSet definitions (ksp)
+/* Path for use in KeyingSet definitions (ksp)
*
* Paths may be either specific (specifying the exact sub-ID
* dynamic data-block - such as PoseChannels - to act upon, ala
@@ -762,18 +762,18 @@ typedef enum eNlaTrack_Flag {
*/
typedef struct KS_Path {
struct KS_Path *next, *prev;
-
+
ID *id; /* ID block that keyframes are for */
char group[64]; /* name of the group to add to - MAX_ID_NAME-2 */
-
+
int idtype; /* ID-type that path can be used on */
-
+
short groupmode; /* group naming (eKSP_Grouping) */
short flag; /* various settings, etc. */
-
+
char *rna_path; /* dynamically (or statically in the case of predefined sets) path */
int array_index; /* index that path affects */
-
+
short keyingflag; /* (eInsertKeyFlags) settings to supply insertkey() with */
short keyingoverride; /* (eInsertKeyFlags) for each flag set, the relevant keyingflag bit overrides the default */
} KS_Path;
@@ -792,14 +792,14 @@ typedef enum eKSP_Grouping {
KSP_GROUP_NONE,
/* path should be grouped using KeyingSet's name */
KSP_GROUP_KSNAME,
- /* path should be grouped using name of inner-most context item from templates
+ /* path should be grouped using name of inner-most context item from templates
* - this is most useful for relative KeyingSets only
*/
KSP_GROUP_TEMPLATE_ITEM
} eKSP_Grouping;
/* ---------------- */
-
+
/* KeyingSet definition (ks)
*
* A KeyingSet defines a group of properties that should
@@ -812,21 +812,21 @@ typedef enum eKSP_Grouping {
*/
typedef struct KeyingSet {
struct KeyingSet *next, *prev;
-
+
ListBase paths; /* (KS_Path) paths to keyframe to */
-
+
char idname[64]; /* unique name (for search, etc.) - MAX_ID_NAME-2 */
char name[64]; /* user-viewable name for KeyingSet (for menus, etc.) - MAX_ID_NAME-2 */
char description[240]; /* (RNA_DYN_DESCR_MAX) short help text. */
char typeinfo[64]; /* name of the typeinfo data used for the relative paths - MAX_ID_NAME-2 */
-
+
int active_path; /* index of the active path */
-
+
short flag; /* settings for KeyingSet */
-
+
short keyingflag; /* (eInsertKeyFlags) settings to supply insertkey() with */
short keyingoverride; /* (eInsertKeyFlags) for each flag set, the relevant keyingflag bit overrides the default */
-
+
char pad[6];
} KeyingSet;
@@ -859,7 +859,7 @@ typedef enum eInsertKeyFlags {
/* AnimOverride ------------------------------------- */
-/* Animation Override (aor)
+/* Animation Override (aor)
*
* This is used to as temporary storage of values which have been changed by the user, but not
* yet keyframed (thus, would get overwritten by the animation system before the user had a chance
@@ -870,10 +870,10 @@ typedef enum eInsertKeyFlags {
*/
typedef struct AnimOverride {
struct AnimOverride *next, *prev;
-
+
char *rna_path; /* RNA-path to use to resolve data-access */
int array_index; /* if applicable, the index of the RNA-array item to get */
-
+
float value; /* value to override setting with */
} AnimOverride;
@@ -965,7 +965,7 @@ typedef enum eAnimData_Recalc {
/* Base Struct for Anim ------------------------------------- */
-/* Used for BKE_animdata_from_id()
+/* Used for BKE_animdata_from_id()
* All ID-datablocks which have their own 'local' AnimData
* should have the same arrangement in their structs.
*/
diff --git a/source/blender/makesdna/DNA_armature_types.h b/source/blender/makesdna/DNA_armature_types.h
index 757c0eb8394..f1fe370788d 100644
--- a/source/blender/makesdna/DNA_armature_types.h
+++ b/source/blender/makesdna/DNA_armature_types.h
@@ -67,17 +67,17 @@ typedef struct Bone {
float dist, weight; /* dist, weight: for non-deformgroup deforms */
float xwidth, length, zwidth; /* width: for block bones. keep in this order, transform! */
float rad_head, rad_tail; /* radius for head/tail sphere, defining deform as well, parent->rad_tip overrides rad_head */
-
+
float roll1, roll2; /* curved bones settings - these define the "restpose" for a curved bone */
float curveInX, curveInY;
float curveOutX, curveOutY;
float ease1, ease2; /* length of bezier handles */
float scaleIn, scaleOut;
-
+
float size[3]; /* patch for upward compat, UNUSED! */
int layer; /* layers that bone appears on */
short segments; /* for B-bones */
-
+
short pad1;
} Bone;
@@ -213,7 +213,7 @@ typedef enum eBone_Flag {
BONE_NO_LOCAL_LOCATION = (1 << 22), /* bone location is in armature space */
BONE_RELATIVE_PARENTING = (1 << 23), /* object child will use relative transform (like deform) */
BONE_ADD_PARENT_END_ROLL = (1 << 24) /* it will add the parent end roll to the inroll */
-
+
} eBone_Flag;
#define MAXBONENAME 64
diff --git a/source/blender/makesdna/DNA_boid_types.h b/source/blender/makesdna/DNA_boid_types.h
index 44764eb012e..a161fde119e 100644
--- a/source/blender/makesdna/DNA_boid_types.h
+++ b/source/blender/makesdna/DNA_boid_types.h
@@ -154,7 +154,7 @@ typedef struct BoidState {
ListBase actions;
char name[32];
int id, flag;
-
+
/* rules */
int ruleset_type;
float rule_fuzziness;
diff --git a/source/blender/makesdna/DNA_camera_types.h b/source/blender/makesdna/DNA_camera_types.h
index 52e40cbc098..961f32246d3 100644
--- a/source/blender/makesdna/DNA_camera_types.h
+++ b/source/blender/makesdna/DNA_camera_types.h
@@ -61,8 +61,8 @@ typedef struct CameraStereoSettings {
typedef struct Camera {
ID id;
- struct AnimData *adt; /* animation data (must be immediately after id for utilities to use it) */
-
+ struct AnimData *adt; /* animation data (must be immediately after id for utilities to use it) */
+
char type; /* CAM_PERSP, CAM_ORTHO or CAM_PANO */
char dtx; /* draw type extra */
short flag;
@@ -78,7 +78,7 @@ typedef struct Camera {
float YF_dofdist;
struct Ipo *ipo DNA_DEPRECATED; /* old animation system, deprecated for 2.5 */
-
+
struct Object *dof_ob;
struct GPUDOFSettings gpu_dof;
diff --git a/source/blender/makesdna/DNA_cloth_types.h b/source/blender/makesdna/DNA_cloth_types.h
index ee147da8dae..992cfedbc47 100644
--- a/source/blender/makesdna/DNA_cloth_types.h
+++ b/source/blender/makesdna/DNA_cloth_types.h
@@ -78,7 +78,7 @@ typedef struct ClothSimSettings {
float vel_damping; /* damp the velocity to speed up getting to the resting position */
float shrink_min; /* min amount to shrink cloth by 0.0f (no shrink) - 1.0f (shrink to nothing) */
float shrink_max; /* max amount to shrink cloth by 0.0f (no shrink) - 1.0f (shrink to nothing) */
-
+
/* XXX various hair stuff
* should really be separate, this struct is a horrible mess already
*/
diff --git a/source/blender/makesdna/DNA_color_types.h b/source/blender/makesdna/DNA_color_types.h
index 6f9c407c6c6..8ed38b0b05d 100644
--- a/source/blender/makesdna/DNA_color_types.h
+++ b/source/blender/makesdna/DNA_color_types.h
@@ -55,7 +55,7 @@ enum {
typedef struct CurveMap {
short totpoint, flag;
-
+
float range; /* quick multiply value for reading table */
float mintable, maxtable; /* the x-axis range for the table */
float ext_in[2], ext_out[2]; /* for extrapolated curves, the direction vector */
@@ -74,13 +74,13 @@ typedef struct CurveMapping {
int flag, cur; /* cur; for buttons, to show active curve */
int preset;
int changed_timestamp;
-
+
rctf curr, clipr; /* current rect, clip rect (is default rect too) */
-
+
CurveMap cm[4]; /* max 4 builtin curves per mapping struct now */
float black[3], white[3]; /* black/white point (black[0] abused for current frame) */
float bwmul[3]; /* black/white point multiply value, for speed */
-
+
float sample[3]; /* sample values, if flag set it draws line and intersection */
} CurveMapping;
diff --git a/source/blender/makesdna/DNA_constraint_types.h b/source/blender/makesdna/DNA_constraint_types.h
index ba558f25ac5..2ae686d178e 100644
--- a/source/blender/makesdna/DNA_constraint_types.h
+++ b/source/blender/makesdna/DNA_constraint_types.h
@@ -53,23 +53,23 @@ typedef struct bConstraintChannel {
/* A Constraint */
typedef struct bConstraint {
struct bConstraint *next, *prev;
-
+
void *data; /* Constraint data (a valid constraint type) */
short type; /* Constraint type */
short flag; /* Flag - General Settings */
-
+
char ownspace; /* Space that owner should be evaluated in */
char tarspace; /* Space that target should be evaluated in (only used if 1 target) */
-
+
char name[64]; /* Constraint name, MAX_NAME */
-
+
short pad;
-
+
float enforce; /* Amount of influence exherted by constraint (0.0-1.0) */
float headtail; /* Point along subtarget bone where the actual target is. 0=head (default for all), 1=tail*/
-
+
struct Ipo *ipo DNA_DEPRECATED; /* local influence ipo or driver */ /* old animation system, deprecated for 2.5 */
-
+
/* below are readonly fields that are set at runtime by the solver for use in the GE (only IK atm) */
float lin_error; /* residual error on constraint expressed in blender unit*/
float rot_error; /* residual error on constraint expressed in radiant */
@@ -87,9 +87,9 @@ typedef struct bConstraintTarget {
struct Object *tar; /* object to use as target */
char subtarget[64]; /* subtarget - pchan or vgroup name, MAX_ID_NAME-2 */
-
+
float matrix[4][4]; /* matrix used during constraint solving - should be cleared before each use */
-
+
short space; /* space that target should be evaluated in (overrides bConstraint->tarspace) */
short flag; /* runtime settings (for editor, etc.) */
short type; /* type of target (eConstraintObType) */
@@ -111,15 +111,15 @@ typedef enum eConstraintObType {
/* Python Script Constraint */
-typedef struct bPythonConstraint {
+typedef struct bPythonConstraint {
struct Text *text; /* text-buffer (containing script) to execute */
IDProperty *prop; /* 'id-properties' used to store custom properties for constraint */
-
+
int flag; /* general settings/state indicators accessed by bitmapping */
int tarnum; /* number of targets - usually only 1-3 are needed */
-
+
ListBase targets; /* a list of targets that this constraint has (bConstraintTarget-s) */
-
+
struct Object *tar; /* target from previous implementation (version-patch sets this to NULL on file-load) */
char subtarget[64]; /* subtarger from previous implentation (version-patch sets this to "" on file-load), MAX_ID_NAME-2 */
} bPythonConstraint;
@@ -155,7 +155,7 @@ typedef enum eConstraint_IK_Type {
} eConstraint_IK_Type;
-/* Spline IK Constraint
+/* Spline IK Constraint
* Aligns 'n' bones to the curvature defined by the curve,
* with the chain ending on the bone that owns this constraint,
* and starting on the nth parent.
@@ -163,16 +163,16 @@ typedef enum eConstraint_IK_Type {
typedef struct bSplineIKConstraint {
/* target(s) */
struct Object *tar; /* curve object (with follow path enabled) which drives the bone chain */
-
+
/* binding details */
float *points; /* array of numpoints items, denoting parametric positions along curve that joints should follow */
short numpoints; /* number of points to bound in points array */
short chainlen; /* number of bones ('n') that are in the chain */
-
+
/* settings */
short flag; /* general settings for constraint */
short xzScaleMode; /* method used for determining the x & z scaling of the bones */
-
+
/* volume preservation settings */
float bulge;
float bulge_min;
@@ -276,12 +276,12 @@ typedef struct bDampTrackConstraint {
/* Follow Path constraints */
typedef struct bFollowPathConstraint {
struct Object *tar; /* Must be path object */
-
+
float offset; /* Offset in time on the path (in frames), when NOT using 'fixed position' */
float offset_fac; /* Parametric offset factor defining position along path, when using 'fixed position' */
-
+
int followflag;
-
+
short trackflag;
short upflag;
} bFollowPathConstraint;
@@ -290,7 +290,7 @@ typedef struct bFollowPathConstraint {
typedef struct bStretchToConstraint {
struct Object *tar;
int flag;
- int volmode;
+ int volmode;
int plane;
float orglength;
float bulge;
@@ -340,11 +340,11 @@ typedef struct bChildOfConstraint {
typedef struct bTransformConstraint {
struct Object *tar; /* target (i.e. 'driver' object/bone) */
char subtarget[64]; /* MAX_ID_NAME-2 */
-
+
short from, to; /* can be loc(0), rot(1) or size(2) */
char map[3]; /* defines which target-axis deform is copied by each owner-axis */
char expo; /* extrapolate motion? if 0, confine to ranges */
-
+
float from_min[3]; /* from_min/max defines range of target transform */
float from_max[3]; /* to map on to to_min/max range. */
float to_min[3]; /* range of motion on owner caused by target */
@@ -369,12 +369,12 @@ typedef struct bPivotConstraint {
struct Object *tar; /* target object (optional) */
char subtarget[64]; /* subtarget name (optional), MAX_ID_NAME-2 */
float offset[3]; /* offset from the target to use, regardless of whether it exists */
-
+
/* Rotation-driven activation:
* This option provides easier one-stop setups for footrolls
*/
short rotAxis; /* rotation axes to consider for this (ePivotConstraint_Axis) */
-
+
/* General flags */
short flag; /* ePivotConstraint_Flag */
} bPivotConstraint;
@@ -411,10 +411,10 @@ typedef struct bSizeLimitConstraint {
typedef struct bDistLimitConstraint {
struct Object *tar;
char subtarget[64]; /* MAX_ID_NAME-2 */
-
+
float dist; /* distance (radius of clamping sphere) from target */
float soft; /* distance from clamping-sphere to start applying 'fade' */
-
+
short flag; /* settings */
short mode; /* how to limit in relation to clamping sphere */
int pad;
@@ -466,7 +466,7 @@ typedef struct bTransformCacheConstraint {
/* ------------------------------------------ */
-/* bConstraint->type
+/* bConstraint->type
* - Do not ever change the order of these, or else files could get
* broken as their correct value cannot be resolved
*/
@@ -486,7 +486,7 @@ typedef enum eBConstraint_Types {
CONSTRAINT_TYPE_ACTION = 12,
CONSTRAINT_TYPE_LOCKTRACK = 13, /* New Tracking constraint that locks an axis in place - theeth */
CONSTRAINT_TYPE_DISTLIMIT = 14, /* limit distance */
- CONSTRAINT_TYPE_STRETCHTO = 15, /* claiming this to be mine :) is in tuhopuu bjornmose */
+ CONSTRAINT_TYPE_STRETCHTO = 15, /* claiming this to be mine :) is in tuhopuu bjornmose */
CONSTRAINT_TYPE_MINMAX = 16, /* floor constraint */
CONSTRAINT_TYPE_RIGIDBODYJOINT = 17, /* rigidbody constraint */
CONSTRAINT_TYPE_CLAMPTO = 18, /* clampto constraint */
@@ -501,21 +501,21 @@ typedef enum eBConstraint_Types {
CONSTRAINT_TYPE_CAMERASOLVER = 27, /* Camera Solver Constraint */
CONSTRAINT_TYPE_OBJECTSOLVER = 28, /* Object Solver Constraint */
CONSTRAINT_TYPE_TRANSFORM_CACHE = 29, /* Transform Cache Constraint */
-
+
/* NOTE: no constraints are allowed to be added after this */
NUM_CONSTRAINT_TYPES
-} eBConstraint_Types;
+} eBConstraint_Types;
/* bConstraint->flag */
/* flags 0x2 (1<<1) and 0x8 (1<<3) were used in past */
/* flag 0x20 (1<<5) was used to indicate that a constraint was evaluated using a 'local' hack for posebones only */
typedef enum eBConstraint_Flags {
/* expand for UI */
- CONSTRAINT_EXPAND = (1<<0),
+ CONSTRAINT_EXPAND = (1<<0),
/* pre-check for illegal object name or bone name */
- CONSTRAINT_DISABLE = (1<<2),
+ CONSTRAINT_DISABLE = (1<<2),
/* to indicate which Ipo should be shown, maybe for 3d access later too */
- CONSTRAINT_ACTIVE = (1<<4),
+ 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),
/* influence ipo is on constraint itself, not in action channel */
@@ -532,8 +532,8 @@ typedef enum eBConstraint_Flags {
typedef enum eBConstraint_SpaceTypes {
/* default for all - worldspace */
CONSTRAINT_SPACE_WORLD = 0,
- /* for objects (relative to parent/without parent influence),
- * for bones (along normals of bone, without parent/restpositions)
+ /* for objects (relative to parent/without parent influence),
+ * for bones (along normals of bone, without parent/restpositions)
*/
CONSTRAINT_SPACE_LOCAL = 1,
/* for posechannels - pose space */
@@ -576,12 +576,12 @@ typedef enum eCopyLocation_Flags {
LOCLIKE_Z_INVERT = (1<<6),
LOCLIKE_OFFSET = (1<<7)
} eCopyLocation_Flags;
-
+
/* bSizeLikeConstraint.flag */
typedef enum eCopyScale_Flags {
SIZELIKE_X = (1<<0),
SIZELIKE_Y = (1<<1),
- SIZELIKE_Z = (1<<2),
+ SIZELIKE_Z = (1<<2),
SIZELIKE_OFFSET = (1<<3)
} eCopyScale_Flags;
@@ -602,7 +602,7 @@ typedef enum eSameVolume_Modes {
/* bActionConstraint.flag */
typedef enum eActionConstraint_Flags {
/* Bones use "object" part of target action, instead of "same bone name" part */
- ACTCON_BONE_USE_OBJECT_ACTION = (1 << 0),
+ ACTCON_BONE_USE_OBJECT_ACTION = (1 << 0),
} eActionConstraint_Flags;
/* Locked-Axis Values (Locked Track) */
@@ -704,7 +704,7 @@ typedef enum eSplineIK_Flags {
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),
-
+
/* for "volumetric" xz scale mode, limit the minimum or maximum scale values */
CONSTRAINT_SPLINEIK_USE_BULGE_MIN = (1 << 5),
CONSTRAINT_SPLINEIK_USE_BULGE_MAX = (1 << 6),
@@ -769,7 +769,7 @@ typedef enum eDistLimit_Modes {
LIMITDIST_OUTSIDE = 1,
LIMITDIST_ONSURFACE = 2
} eDistLimit_Modes;
-
+
/* python constraint -> flag */
typedef enum ePyConstraint_Flags {
PYCON_USETARGETS = (1<<0),
@@ -795,14 +795,14 @@ typedef enum eChildOf_Flags {
typedef enum ePivotConstraint_Axis {
/* do not consider this activity-clamping */
PIVOTCON_AXIS_NONE = -1,
-
+
/* consider -ve x-axis rotations */
PIVOTCON_AXIS_X_NEG = 0,
/* consider -ve y-axis rotations */
PIVOTCON_AXIS_Y_NEG = 1,
/* consider -ve z-axis rotations */
PIVOTCON_AXIS_Z_NEG = 2,
-
+
/* consider +ve x-axis rotations */
PIVOTCON_AXIS_X = 3,
/* consider +ve y-axis rotations */
diff --git a/source/blender/makesdna/DNA_controller_types.h b/source/blender/makesdna/DNA_controller_types.h
index 154542d60c5..db0c8078211 100644
--- a/source/blender/makesdna/DNA_controller_types.h
+++ b/source/blender/makesdna/DNA_controller_types.h
@@ -55,16 +55,16 @@ typedef struct bController {
struct bController *next, *prev, *mynew;
short type, flag, inputs, totlinks;
short otype, totslinks, pad2, pad3;
-
+
char name[64];
void *data;
-
+
struct bActuator **links;
struct bSensor **slinks;
short val, valo;
unsigned int state_mask;
-
+
} bController;
/* controller->type */
diff --git a/source/blender/makesdna/DNA_curve_types.h b/source/blender/makesdna/DNA_curve_types.h
index fa40fd298d7..04395e32717 100644
--- a/source/blender/makesdna/DNA_curve_types.h
+++ b/source/blender/makesdna/DNA_curve_types.h
@@ -110,14 +110,14 @@ typedef struct BevList {
typedef struct BezTriple {
float vec[3][3];
float alfa, weight, radius; /* alfa: tilt in 3D View, weight: used for softbody goal weight, radius: for bevel tapering */
-
+
char ipo; /* ipo: interpolation mode for segment from this BezTriple to the next */
-
+
char h1, h2; /* h1, h2: the handle type of the two handles */
char f1, f2, f3; /* f1, f2, f3: used for selection status */
-
+
char hide; /* hide: used to indicate whether BezTriple is hidden (3D), type of keyframe (eBezTriple_KeyframeType) */
-
+
char easing; /* easing: easing type for interpolation mode (eBezTriple_Easing) */
float back; /* BEZT_IPO_BACK */
float amplitude, period; /* BEZT_IPO_ELASTIC */
@@ -148,14 +148,14 @@ typedef struct Nurb {
short resolu, resolv; /* tessellation resolution in the U or V directions */
short orderu, orderv;
short flagu, flagv;
-
+
float *knotsu, *knotsv;
BPoint *bp;
BezTriple *bezt;
short tilt_interp; /* KEY_LINEAR, KEY_CARDINAL, KEY_BSPLINE */
short radius_interp;
-
+
/* only used for dynamically generated Nurbs created from OB_FONT's */
int charidx;
} Nurb;
@@ -187,19 +187,19 @@ typedef struct EditNurb {
typedef struct Curve {
ID id;
- struct AnimData *adt; /* animation data (must be immediately after id for utilities to use it) */
-
+ struct AnimData *adt; /* animation data (must be immediately after id for utilities to use it) */
+
struct BoundBox *bb;
-
+
ListBase nurb; /* actual data, called splines in rna */
-
+
EditNurb *editnurb; /* edited data, not in file, use pointer so we can check for it */
-
+
struct Object *bevobj, *taperobj, *textoncurve;
struct Ipo *ipo DNA_DEPRECATED; /* old animation system, deprecated for 2.5 */
struct Key *key;
struct Material **mat;
-
+
/* texture space, copied as one block in editobject.c */
float loc[3];
float size[3];
@@ -215,7 +215,7 @@ typedef struct Curve {
short bevresol, totcol;
int flag;
float width, ext1, ext2;
-
+
/* default */
short resolu, resolv;
short resolu_ren, resolv_ren;
@@ -250,10 +250,10 @@ typedef struct Curve {
struct VFont *vfontb;
struct VFont *vfonti;
struct VFont *vfontbi;
-
+
struct TextBox *tb;
int totbox, actbox;
-
+
struct CharInfo *strinfo;
struct CharInfo curinfo;
/* font part end */
@@ -406,7 +406,7 @@ typedef enum eBezTriple_Interpolation {
BEZT_IPO_CONST = 0, /* constant interpolation */
BEZT_IPO_LIN = 1, /* linear interpolation */
BEZT_IPO_BEZ = 2, /* bezier interpolation */
-
+
/* easing equations */
BEZT_IPO_BACK = 3,
BEZT_IPO_BOUNCE = 4,
@@ -423,7 +423,7 @@ typedef enum eBezTriple_Interpolation {
/* easing modes (used only for Keyframes - BezTriple->easing) */
typedef enum eBezTriple_Easing {
BEZT_IPO_EASE_AUTO = 0,
-
+
BEZT_IPO_EASE_IN = 1,
BEZT_IPO_EASE_OUT = 2,
BEZT_IPO_EASE_IN_OUT = 3,
diff --git a/source/blender/makesdna/DNA_dynamicpaint_types.h b/source/blender/makesdna/DNA_dynamicpaint_types.h
index 17553e98817..b0afe99a77d 100644
--- a/source/blender/makesdna/DNA_dynamicpaint_types.h
+++ b/source/blender/makesdna/DNA_dynamicpaint_types.h
@@ -99,7 +99,7 @@ enum {
};
typedef struct DynamicPaintSurface {
-
+
struct DynamicPaintSurface *next, *prev;
struct DynamicPaintCanvasSettings *canvas; /* for fast RNA access */
struct PaintSurfaceData *data;
diff --git a/source/blender/makesdna/DNA_effect_types.h b/source/blender/makesdna/DNA_effect_types.h
index 7ca3bbe3319..93bee694bb5 100644
--- a/source/blender/makesdna/DNA_effect_types.h
+++ b/source/blender/makesdna/DNA_effect_types.h
@@ -46,7 +46,7 @@
/* emit only from faces*/
#define PAF_OFACE 64
/* show emitter (don't hide actual mesh)*/
-#define PAF_SHOWE 128
+#define PAF_SHOWE 128
/* true random emit from faces (not just ordered jitter)*/
#define PAF_TRAND 256
/* even distribution in face emission based on face areas*/
@@ -78,15 +78,15 @@
typedef struct Effect {
struct Effect *next, *prev;
short type, flag, buttype, rt;
-
+
} Effect;
typedef struct BuildEff {
struct BuildEff *next, *prev;
short type, flag, buttype, rt;
-
+
float len, sfra;
-
+
} BuildEff;
#
@@ -102,40 +102,40 @@ struct Group;
typedef struct PartEff {
struct PartEff *next, *prev;
short type, flag, buttype, stype, vertgroup, userjit;
-
+
float sta, end, lifetime;
int totpart, totkey, seed;
-
+
float normfac, obfac, randfac, texfac, randlife;
float force[3];
float damp;
-
+
float nabla, vectsize, maxlen, pad, defvec[3];
-
+
float mult[4], life[4];
short child[4], mat[4];
short texmap, curmult;
short staticstep, omat, timetex, speedtex, flag2, flag2neg;
short disp, vertgroup_v;
-
+
char vgroupname[64], vgroupname_v[64]; /* MAX_VGROUP_NAME */
float imat[4][4]; /* inverse matrix of parent Object */
-
+
Particle *keys;
struct Group *group;
-
+
} PartEff;
typedef struct WaveEff {
struct WaveEff *next, *prev;
short type, flag, buttype, stype;
-
+
float startx, starty, height, width;
float narrow, speed, minfac, damp;
-
+
float timeoffs, lifetime;
-
+
} WaveEff;
#endif
diff --git a/source/blender/makesdna/DNA_gpencil_types.h b/source/blender/makesdna/DNA_gpencil_types.h
index 1c1190dfc6a..45f2d6c70e4 100644
--- a/source/blender/makesdna/DNA_gpencil_types.h
+++ b/source/blender/makesdna/DNA_gpencil_types.h
@@ -54,7 +54,7 @@ typedef struct bGPDspoint {
typedef enum eGPDspoint_Flag {
/* stroke point is selected (for editing) */
GP_SPOINT_SELECT = (1 << 0),
-
+
/* stroke point is tagged (for some editing operation) */
GP_SPOINT_TAG = (1 << 1),
} eGPSPoint_Flag;
@@ -168,7 +168,7 @@ typedef struct bGPDstroke {
short flag, pad[2]; /* various settings about this stroke */
double inittime; /* Init time of stroke */
- /* The pointer to color is only used during drawing, but not saved
+ /* The pointer to color is only used during drawing, but not saved
* colorname is the join with the palette, but when draw, the pointer is update if the value is NULL
* to speed up the drawing
*/
@@ -203,11 +203,11 @@ typedef enum eGPDstroke_Flag {
*/
typedef struct bGPDframe {
struct bGPDframe *next, *prev;
-
+
ListBase strokes; /* list of the simplified 'strokes' that make up the frame's data */
-
+
int framenum; /* frame number of this frame */
-
+
short flag; /* temp settings */
short key_type; /* keyframe type (eBezTriple_KeyframeType) */
} bGPDframe;
@@ -223,30 +223,30 @@ typedef enum eGPDframe_Flag {
/* Grease-Pencil Annotations - 'Layer' */
typedef struct bGPDlayer {
struct bGPDlayer *next, *prev;
-
+
ListBase frames; /* list of annotations to display for frames (bGPDframe list) */
bGPDframe *actframe; /* active frame (should be the frame that is currently being displayed) */
-
+
short flag; /* settings for layer */
short thickness; /* current thickness to apply to strokes */
-
+
short gstep; /* Ghosts Before: max number of ghost frames to show between active frame and the one before it (0 = only the ghost itself) */
short gstep_next; /* Ghosts After: max number of ghost frames to show after active frame and the following it (0 = only the ghost itself) */
-
+
float gcolor_prev[3]; /* optional color for ghosts before the active frame */
float gcolor_next[3]; /* optional color for ghosts after the active frame */
-
+
float color[4]; /* Color for strokes in layers (replaced by palettecolor). Only used for ruler (which uses GPencil internally) */
float fill[4]; /* Fill color for strokes in layers. Not used and replaced by palettecolor fill */
-
+
char info[128]; /* optional reference info about this layer (i.e. "director's comments, 12/3")
* this is used for the name of the layer too and kept unique. */
-
+
struct Object *parent; /* parent object */
float inverse[4][4]; /* inverse matrix (only used if parented) */
char parsubstr[64]; /* String describing subobject info, MAX_ID_NAME-2 */
short partype, pad;
-
+
float tintcolor[4]; /* Color used to tint layer, alpha value is used as factor */
float opacity; /* Opacity of the layer */
} bGPDlayer;
@@ -287,13 +287,13 @@ typedef enum eGPDlayer_Flag {
typedef struct bGPdata {
ID id; /* Grease Pencil data is a datablock */
struct AnimData *adt; /* animation data - for animating draw settings */
-
+
/* saved Grease-Pencil data */
ListBase layers; /* bGPDlayers */
int flag; /* settings for this datablock */
- /* not-saved stroke buffer data (only used during paint-session)
- * - buffer must be initialized before use, but freed after
+ /* not-saved stroke buffer data (only used during paint-session)
+ * - buffer must be initialized before use, but freed after
* whole paint operation is over
*/
short sbuffer_size; /* number of elements currently in cache */
@@ -315,29 +315,29 @@ typedef struct bGPdata {
typedef enum eGPdata_Flag {
/* don't allow painting to occur at all */
/* GP_DATA_LMBPLOCK = (1 << 0), */
-
+
/* show debugging info in viewport (i.e. status print) */
GP_DATA_DISPINFO = (1 << 1),
/* in Action Editor, show as expanded channel */
GP_DATA_EXPAND = (1 << 2),
-
+
/* is the block overriding all clicks? */
/* GP_DATA_EDITPAINT = (1 << 3), */
-
+
/* ------------------------------------------------ DEPRECATED */
/* new strokes are added in viewport space */
GP_DATA_VIEWALIGN = (1 << 4),
-
+
/* Project into the screen's Z values */
GP_DATA_DEPTH_VIEW = (1 << 5),
GP_DATA_DEPTH_STROKE = (1 << 6),
GP_DATA_DEPTH_STROKE_ENDPOINTS = (1 << 7),
/* ------------------------------------------------ DEPRECATED */
-
+
/* Stroke Editing Mode - Toggle to enable alternative keymap for easier editing of stroke points */
GP_DATA_STROKE_EDITMODE = (1 << 8),
-
+
/* Convenience/cache flag to make it easier to quickly toggle onion skinning on/off */
GP_DATA_SHOW_ONIONSKINS = (1 << 9),
/* Draw a green and red point to indicate start and end of the stroke */
diff --git a/source/blender/makesdna/DNA_group_types.h b/source/blender/makesdna/DNA_group_types.h
index 45dd0cb9ff2..ae565427365 100644
--- a/source/blender/makesdna/DNA_group_types.h
+++ b/source/blender/makesdna/DNA_group_types.h
@@ -50,7 +50,7 @@ typedef struct GroupObject {
typedef struct Group {
ID id;
-
+
ListBase gobject; /* GroupObject */
struct PreviewImage *preview;
diff --git a/source/blender/makesdna/DNA_image_types.h b/source/blender/makesdna/DNA_image_types.h
index b4bc26f45cd..760e9b5461e 100644
--- a/source/blender/makesdna/DNA_image_types.h
+++ b/source/blender/makesdna/DNA_image_types.h
@@ -98,12 +98,12 @@ enum {
typedef struct Image {
ID id;
-
+
char name[1024]; /* file path, 1024 = FILE_MAX */
-
+
struct MovieCache *cache; /* not written in file */
struct GPUTexture *gputexture[2]; /* not written in file 2 = TEXTARGET_COUNT */
-
+
/* sources from: */
ListBase anims;
struct RenderResult *rr;
@@ -122,7 +122,7 @@ typedef struct Image {
unsigned int bindcode[2]; /* only for current image... 2 = TEXTARGET_COUNT */
char pad1[4];
unsigned int *repbind; /* for repeat of parts of images */
-
+
struct PackedFile *packedfile DNA_DEPRECATED; /* deprecated */
struct ListBase packedfiles;
struct PreviewImage *preview;
@@ -133,13 +133,13 @@ typedef struct Image {
short animspeed;
short ok;
-
+
/* for generated images */
int gen_x, gen_y;
char gen_type, gen_flag;
short gen_depth;
float gen_color[4];
-
+
/* display aspect - for UV editing images resized for faster openGL display */
float aspx, aspy;
@@ -188,7 +188,7 @@ enum {
#define IMA_TWINANIM 2
#define IMA_COLCYCLE 4 /* Depreciated */
#define IMA_MIPMAP_COMPLETE 8 /* all mipmap levels in OpenGL texture set? */
-#define IMA_CLAMP_U 16
+#define IMA_CLAMP_U 16
#define IMA_CLAMP_V 32
#define IMA_TPAGE_REFRESH 64
#define IMA_GLBIND_IS_DATA 128 /* opengl image texture bound as non-color data */
diff --git a/source/blender/makesdna/DNA_ipo_types.h b/source/blender/makesdna/DNA_ipo_types.h
index 5ba822616eb..f97935a09a1 100644
--- a/source/blender/makesdna/DNA_ipo_types.h
+++ b/source/blender/makesdna/DNA_ipo_types.h
@@ -24,7 +24,7 @@
*
* ***** END GPL LICENSE BLOCK *****
*/
-
+
/** \file DNA_ipo_types.h
* \ingroup DNA
* \deprecated
@@ -32,7 +32,7 @@
* which has (as of 2.50) been replaced with a completely new system by Joshua Leung (aligorith). All defines,
* etc. are only still maintained to provide backwards compatibility for old files.
*/
-
+
#ifndef __DNA_IPO_TYPES_H__
#define __DNA_IPO_TYPES_H__
@@ -53,7 +53,7 @@
typedef struct IpoDriver {
struct Object *ob; /* target/driver ob */
short blocktype, adrcode; /* sub-channel to use */
-
+
short type, flag; /* driver settings */
char name[128]; /* bone, or python expression here */
} IpoDriver;
@@ -63,7 +63,7 @@ typedef struct IpoDriver {
/* IPO Curve */
typedef struct IpoCurve {
struct IpoCurve *next, *prev;
-
+
struct BPoint *bp; /* array of BPoints (sizeof(BPoint) * totvert) - i.e. baked/imported data */
struct BezTriple *bezt; /* array of BezTriples (sizeof(BezTriple) * totvert) - i.e. user-editable keyframes */
@@ -75,10 +75,10 @@ typedef struct IpoCurve {
short flag, rt; /* flag= settings; rt= ??? */
float ymin, ymax; /* minimum/maximum y-extents for curve */
unsigned int bitmask; /* ??? */
-
+
float slide_min, slide_max; /* minimum/maximum values for sliders (in action editor) */
float curval; /* value of ipo-curve for current frame */
-
+
IpoDriver *driver; /* pointer to ipo-driver for this curve */
} IpoCurve;
@@ -87,10 +87,10 @@ typedef struct IpoCurve {
/* IPO Data-Block */
typedef struct Ipo {
ID id;
-
+
ListBase curve; /* A list of IpoCurve structs in a linked list. */
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) */
} Ipo;
@@ -475,7 +475,7 @@ typedef struct Ipo {
#define IPO_LIN 1
#define IPO_BEZ 2
/* not used yet */
-#define IPO_MIXED 3
+#define IPO_MIXED 3
/* icu->extrap */
#define IPO_HORIZ 0
@@ -496,7 +496,7 @@ typedef struct Ipo {
/* ---------- IPO Drivers ----------- */
/* offset in driver->name for finding second posechannel for rot-diff */
-#define DRIVER_NAME_OFFS 32
+#define DRIVER_NAME_OFFS 32
/* driver->type */
#define IPO_DRIVER_TYPE_NORMAL 0
diff --git a/source/blender/makesdna/DNA_key_types.h b/source/blender/makesdna/DNA_key_types.h
index 60ab01c901b..2b097092bc4 100644
--- a/source/blender/makesdna/DNA_key_types.h
+++ b/source/blender/makesdna/DNA_key_types.h
@@ -58,7 +58,7 @@ typedef struct KeyBlock {
int totelem; /* total number if items in the keyblock (compare with mesh/curve verts to check we match) */
int uid; /* for meshes only, match the unique number with the customdata layer */
-
+
void *data; /* array of shape key values, size is (Key->elemsize * KeyBlock->totelem) */
char name[64]; /* MAX_NAME (unique name, user assigned) */
char vgroup[64]; /* MAX_VGROUP_NAME (optional vertex group), array gets allocated into 'weights' when set */
@@ -72,7 +72,7 @@ typedef struct KeyBlock {
typedef struct Key {
ID id;
- struct AnimData *adt; /* animation data (must be immediately after id for utilities to use it) */
+ struct AnimData *adt; /* animation data (must be immediately after id for utilities to use it) */
/* commonly called 'Basis', (Key->type == KEY_RELATIVE) only.
* Looks like this is _always_ 'key->block.first',
@@ -85,7 +85,7 @@ typedef struct Key {
char elemstr[32];
int elemsize; /* size of each element in #KeyBlock.data, use for allocation and stride */
int pad;
-
+
ListBase block; /* list of KeyBlock's */
struct Ipo *ipo DNA_DEPRECATED; /* old animation system, deprecated for 2.5 */
diff --git a/source/blender/makesdna/DNA_lamp_types.h b/source/blender/makesdna/DNA_lamp_types.h
index a2e39f93875..d5394cad6b3 100644
--- a/source/blender/makesdna/DNA_lamp_types.h
+++ b/source/blender/makesdna/DNA_lamp_types.h
@@ -47,30 +47,30 @@ struct MTex;
typedef struct Lamp {
ID id;
- struct AnimData *adt; /* animation data (must be immediately after id for utilities to use it) */
-
+ struct AnimData *adt; /* animation data (must be immediately after id for utilities to use it) */
+
short type, flag;
int mode;
-
+
short colormodel, totex;
float r, g, b, k;
float shdwr, shdwg, shdwb, shdwpad;
-
+
float energy, dist, spotsize, spotblend;
float haint;
-
-
+
+
float att1, att2; /* Quad1 and Quad2 attenuation */
float coeff_const, coeff_lin, coeff_quad, coeff_pad;
struct CurveMapping *curfalloff;
short falloff_type;
short pad2;
-
+
float clipsta, clipend;
float bias, soft, compressthresh, bleedbias, pad5;
short bufsize, samp, buffers, filtertype;
char bufflag, buftype;
-
+
short ray_samp, ray_sampy, ray_sampz;
short ray_samp_type;
short area_shape;
@@ -78,10 +78,10 @@ typedef struct Lamp {
float adapt_thresh;
short ray_samp_method;
short shadowmap_type;
-
+
/* texact is for buttons */
short texact, shadhalostep;
-
+
/* sun/sky */
short sun_effect_type;
short skyblendtype;
@@ -117,7 +117,7 @@ typedef struct Lamp {
/* flag */
#define LA_DS_EXPAND 1
- /* NOTE: this must have the same value as MA_DS_SHOW_TEXS,
+ /* NOTE: this must have the same value as MA_DS_SHOW_TEXS,
* otherwise anim-editors will not read correctly
*/
#define LA_DS_SHOW_TEXS 4
diff --git a/source/blender/makesdna/DNA_lattice_types.h b/source/blender/makesdna/DNA_lattice_types.h
index 242d6f0feeb..911bd06b169 100644
--- a/source/blender/makesdna/DNA_lattice_types.h
+++ b/source/blender/makesdna/DNA_lattice_types.h
@@ -52,22 +52,22 @@ typedef struct EditLatt {
typedef struct Lattice {
ID id;
struct AnimData *adt;
-
+
short pntsu, pntsv, pntsw, flag;
short opntsu, opntsv, opntsw, pad2;
char typeu, typev, typew, pad3;
int actbp; /* active element index, unset with LT_ACTBP_NONE */
float fu, fv, fw, du, dv, dw;
-
+
struct BPoint *def;
-
+
struct Ipo *ipo DNA_DEPRECATED; /* old animation system, deprecated for 2.5 */
struct Key *key;
-
+
struct MDeformVert *dvert;
char vgroup[64]; /* multiply the influence, MAX_VGROUP_NAME */
-
+
struct EditLatt *editlatt;
} Lattice;
diff --git a/source/blender/makesdna/DNA_material_types.h b/source/blender/makesdna/DNA_material_types.h
index 0c500e366a7..de630686af7 100644
--- a/source/blender/makesdna/DNA_material_types.h
+++ b/source/blender/makesdna/DNA_material_types.h
@@ -63,7 +63,7 @@ typedef struct VolumeSettings {
float density_scale;
float depth_cutoff;
float asymmetry;
-
+
short stepsize_type;
short shadeflag;
short shade_type;
@@ -92,8 +92,8 @@ typedef struct TexPaintSlot {
typedef struct Material {
ID id;
- struct AnimData *adt; /* animation data (must be immediately after id for utilities to use it) */
-
+ struct AnimData *adt; /* animation data (must be immediately after id for utilities to use it) */
+
short material_type, flag;
/* note, keep this below synced with render_types.h */
float r, g, b;
@@ -104,7 +104,7 @@ typedef struct Material {
float alpha, ref, spec, zoffs, add;
float translucency;
/* end synced with render_types.h */
-
+
struct VolumeSettings vol;
struct GameSettings game;
@@ -115,7 +115,7 @@ typedef struct Material {
short ray_depth, ray_depth_tra;
short har;
char seed1, seed2;
-
+
float gloss_mir, gloss_tra;
short samp_gloss_mir, samp_gloss_tra;
float adapt_thresh_mir, adapt_thresh_tra;
@@ -123,7 +123,7 @@ typedef struct Material {
float dist_mir;
short fadeto_mir;
short shade_flag; /* like Cubic interpolation */
-
+
int mode, mode_l; /* mode_l is the or-ed result of all layer modes */
int mode2, mode2_l; /* additional mode flags */
short flarec, starc, linec, ringc;
@@ -131,16 +131,16 @@ typedef struct Material {
float strand_sta, strand_end, strand_ease, strand_surfnor;
float strand_min, strand_widthfade;
char strand_uvname[64]; /* MAX_CUSTOMDATA_LAYER_NAME */
-
+
float sbias; /* shadow bias to prevent terminator prob */
float lbias; /* factor to multiply lampbias with (0.0 = no mult) */
float shad_alpha; /* in use for irregular shadowbuffer */
int septex;
-
+
/* for buttons and render*/
char rgbsel, texact, pr_type, use_nodes;
short pr_lamp, pr_texture, ml_flag; /* ml_flag is for disable base material */
-
+
/* mapping */
char mapflag, pad;
@@ -155,7 +155,7 @@ typedef struct Material {
/* runtime - OR'd from 'mtex' */
short texco, mapto;
-
+
/* ramp colors */
struct ColorBand *ramp_col;
struct ColorBand *ramp_spec;
@@ -253,7 +253,7 @@ typedef struct Material {
/* for dopesheet */
#define MA_DS_EXPAND 2
/* for dopesheet (texture stack expander)
- * NOTE: this must have the same value as other texture stacks,
+ * NOTE: this must have the same value as other texture stacks,
* otherwise anim-editors will not read correctly
*/
#define MA_DS_SHOW_TEXS 4
@@ -369,8 +369,8 @@ typedef struct Material {
#define MA_RAMP_SAT 13
#define MA_RAMP_VAL 14
#define MA_RAMP_COLOR 15
-#define MA_RAMP_SOFT 16
-#define MA_RAMP_LINEAR 17
+#define MA_RAMP_SOFT 16
+#define MA_RAMP_LINEAR 17
/* texco */
#define TEXCO_ORCO 1
diff --git a/source/blender/makesdna/DNA_mesh_types.h b/source/blender/makesdna/DNA_mesh_types.h
index 39e56925903..36fb54e6c61 100644
--- a/source/blender/makesdna/DNA_mesh_types.h
+++ b/source/blender/makesdna/DNA_mesh_types.h
@@ -57,7 +57,7 @@ typedef struct Mesh {
struct AnimData *adt; /* animation data (must be immediately after id for utilities to use it) */
struct BoundBox *bb;
-
+
struct Ipo *ipo DNA_DEPRECATED; /* old animation system, deprecated for 2.5 */
struct Key *key;
struct Material **mat;
@@ -105,7 +105,7 @@ typedef struct Mesh {
* this means the active face must always be selected, this is to keep track
* of the last selected face and is similar to the old active face flag where
* the face does not need to be selected, -1 is inactive */
- int act_face;
+ int act_face;
/* texture space, copied as one block in editobject.c */
float loc[3];
diff --git a/source/blender/makesdna/DNA_meshdata_types.h b/source/blender/makesdna/DNA_meshdata_types.h
index 8bb711339f7..bda557fc59d 100644
--- a/source/blender/makesdna/DNA_meshdata_types.h
+++ b/source/blender/makesdna/DNA_meshdata_types.h
@@ -437,7 +437,7 @@ enum {
enum {
ME_SMOOTH = (1 << 0),
ME_FACE_SEL = (1 << 1),
-/* ME_HIDE = (1 << 4), */
+/* ME_HIDE = (1 << 4), */
};
#define ME_POLY_LOOP_PREV(mloop, mp, i) (&(mloop)[(mp)->loopstart + (((i) + (mp)->totloop - 1) % (mp)->totloop)])
diff --git a/source/blender/makesdna/DNA_meta_types.h b/source/blender/makesdna/DNA_meta_types.h
index 68d16700a73..aa926623e34 100644
--- a/source/blender/makesdna/DNA_meta_types.h
+++ b/source/blender/makesdna/DNA_meta_types.h
@@ -57,34 +57,34 @@ typedef struct MetaElem {
float rad2; /* temp field, used only while processing */
float s; /* stiffness, how much of the element to fill */
float len; /* old, only used for backwards compat. use dimensions now */
-
+
float *mat, *imat; /* matrix and inverted matrix */
-
+
} MetaElem;
typedef struct MetaBall {
ID id;
struct AnimData *adt;
-
+
ListBase elems;
ListBase disp;
ListBase *editelems; /* not saved in files, note we use pointer for editmode check */
struct Ipo *ipo DNA_DEPRECATED; /* old animation system, deprecated for 2.5 */
/* material of the mother ball will define the material used of all others */
- struct Material **mat;
+ struct Material **mat;
char flag, flag2; /* flag is enum for updates, flag2 is bitflags for settings */
short totcol;
short texflag, pad; /* used to store MB_AUTOSPACE */
-
+
/* texture space, copied as one block in editobject.c */
float loc[3];
float size[3];
float rot[3];
-
+
float wiresize, rendersize; /* display and render res */
-
+
/* bias elements to have an offset volume.
* mother ball changes will effect other objects thresholds,
* but these may also have their own thresh as an offset */
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h
index cfd4a68a841..a023237d847 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -174,7 +174,7 @@ typedef struct BuildModifierData {
float start, length;
short flag;
-
+
short randomize; /* (bool) whether order of vertices is randomized - legacy files (for readfile conversion) */
int seed; /* (int) random seed */
} BuildModifierData;
@@ -612,7 +612,7 @@ typedef struct ClothModifierData {
float hair_grid_max[3];
int hair_grid_res[3];
float hair_grid_cellsize;
-
+
struct ClothSolverResult *solver_result;
} ClothModifierData;
@@ -960,7 +960,7 @@ typedef struct OceanModifierData {
struct Ocean *ocean;
struct OceanCache *oceancache;
-
+
int resolution;
int spatial_size;
diff --git a/source/blender/makesdna/DNA_nla_types.h b/source/blender/makesdna/DNA_nla_types.h
index 16af3bb1be4..c5e14374fb3 100644
--- a/source/blender/makesdna/DNA_nla_types.h
+++ b/source/blender/makesdna/DNA_nla_types.h
@@ -43,11 +43,11 @@ typedef struct bActionModifier {
struct bActionModifier *next, *prev;
short type, flag;
char channel[32];
-
+
/* noise modifier */
float noisesize, turbul;
short channels;
-
+
/* path deform modifier */
short no_rot_axis;
struct Object *ob;
@@ -74,10 +74,10 @@ typedef struct bActionStrip {
float scale; /* The amount the action range is scaled by */
float blendin, blendout; /* The number of frames on either end of the strip's length to fade in/out */
-
+
char stridechannel[32]; /* Instead of stridelen, it uses an action channel */
char offs_bone[32]; /* if repeat, use this bone/channel for defining offset */
-
+
ListBase modifiers; /* modifier stack */
} bActionStrip;
diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h
index 3cbcc86a692..b95506cea48 100644
--- a/source/blender/makesdna/DNA_node_types.h
+++ b/source/blender/makesdna/DNA_node_types.h
@@ -85,36 +85,36 @@ typedef struct bNodeStack {
typedef struct bNodeSocket {
struct bNodeSocket *next, *prev, *new_sock;
-
+
IDProperty *prop; /* user-defined properties */
-
+
char identifier[64]; /* unique identifier for mapping */
-
+
char name[64]; /* MAX_NAME */
-
+
/* XXX deprecated, only used for the Image and OutputFile nodes,
* should be removed at some point.
*/
void *storage; /* custom storage */
-
+
short type, flag;
short limit; /* max. number of links */
short in_out; /* input/output type */
struct bNodeSocketType *typeinfo; /* runtime type information */
char idname[64]; /* runtime type identifier */
-
+
float locx, locy;
-
+
void *default_value; /* default input value used for unlinked sockets */
-
+
/* execution data */
short stack_index; /* local stack index */
/* XXX deprecated, kept for forward compatibility */
short stack_type DNA_DEPRECATED;
char draw_shape, pad[3];
-
+
void *cache; /* cached data from execution */
-
+
/* internal data to retrieve relations and groups
* DEPRECATED, now uses the generic identifier string instead
*/
@@ -123,7 +123,7 @@ typedef struct bNodeSocket {
int to_index DNA_DEPRECATED;
/* XXX deprecated, still forward compatible since verification restores pointer from matching own_index. */
struct bNodeSocket *groupsock DNA_DEPRECATED;
-
+
struct bNodeLink *link; /* a link pointer, set in ntreeUpdateTree */
/* XXX deprecated, socket input values are stored in default_value now. kept for forward compatibility */
@@ -174,10 +174,10 @@ typedef struct bNode {
struct bNode *next, *prev, *new_node;
IDProperty *prop; /* user-defined properties */
-
+
struct bNodeType *typeinfo; /* runtime type information */
char idname[64]; /* runtime type identifier */
-
+
char name[64]; /* MAX_NAME */
int flag;
short type, pad;
@@ -186,23 +186,23 @@ typedef struct bNode {
short stack_index; /* for groupnode, offset in global caller stack */
short nr; /* number of this node in list, used for UI exec events */
float color[3]; /* custom user-defined color */
-
+
ListBase inputs, outputs;
struct bNode *parent; /* parent node */
struct ID *id; /* optional link to libdata */
void *storage; /* custom data, must be struct, for storage in file */
struct bNode *original; /* the original node in the tree (for localized tree) */
ListBase internal_links; /* list of cached internal links (input to output), for muted nodes and operators */
-
+
float locx, locy; /* root offset for drawing (parent space) */
float width, height; /* node custom width and height */
float miniwidth; /* node width if hidden */
float offsetx, offsety; /* additional offset from loc */
float anim_init_locx; /* initial locx for insert offset animation */
float anim_ofsx; /* offset that will be added to locx for insert offset animation */
-
+
int update; /* update flags */
-
+
char label[64]; /* custom user-defined label, MAX_NAME */
short custom1, custom2; /* to be abused for buttons */
float custom3, custom4;
@@ -287,7 +287,7 @@ typedef struct bNodeInstanceKey {
*/
typedef struct bNodeInstanceHashEntry {
bNodeInstanceKey key;
-
+
/* tags for cleaning the cache */
short tag;
short pad;
@@ -296,7 +296,7 @@ typedef struct bNodeInstanceHashEntry {
typedef struct bNodePreview {
bNodeInstanceHashEntry hash_entry; /* must be first */
-
+
unsigned char *rect;
short xsize, ysize;
int pad;
@@ -305,10 +305,10 @@ typedef struct bNodePreview {
typedef struct bNodeLink {
struct bNodeLink *next, *prev;
-
+
bNode *fromnode, *tonode;
bNodeSocket *fromsock, *tosock;
-
+
int flag;
int pad;
} bNodeLink;
@@ -335,41 +335,41 @@ typedef struct bNodeLink {
/* only re-usable node trees are in the library though, materials and textures allocate own tree struct */
typedef struct bNodeTree {
ID id;
- struct AnimData *adt; /* animation data (must be immediately after id for utilities to use it) */
-
+ struct AnimData *adt; /* animation data (must be immediately after id for utilities to use it) */
+
struct bNodeTreeType *typeinfo; /* runtime type information */
char idname[64]; /* runtime type identifier */
-
+
struct StructRNA *interface_type; /* runtime RNA type of the group interface */
-
+
struct bGPdata *gpd; /* grease pencil data */
float view_center[2]; /* node tree stores own offset for consistent editor view */
-
+
ListBase nodes, links;
-
+
int type, init; /* set init on fileread */
- int cur_index; /* sockets in groups have unique identifiers, adding new sockets always
+ int cur_index; /* sockets in groups have unique identifiers, adding new sockets always
* will increase this counter */
int flag;
int update; /* update flags */
short is_updating; /* flag to prevent reentrant update calls */
short done; /* generic temporary flag for recursion check (DFS/BFS) */
int pad2;
-
+
int nodetype DNA_DEPRECATED; /* specific node type this tree is used for */
short edit_quality; /* Quality setting when editing */
short render_quality; /* Quality setting when rendering */
int chunksize; /* tile size for compositor engine */
-
+
rctf viewer_border;
-
+
/* Lists of bNodeSocket to hold default values and own_index.
* Warning! Don't make links to these sockets, input/output nodes are used for that.
* These sockets are used only for generating external interfaces.
*/
ListBase inputs, outputs;
-
+
/* Node preview hash table
* Only available in base node trees (e.g. scene->node_tree)
*/
@@ -379,7 +379,7 @@ typedef struct bNodeTree {
*/
bNodeInstanceKey active_viewer_key;
int pad;
-
+
/* execution data */
/* XXX It would be preferable to completely move this data out of the underlying node tree,
* so node tree execution could finally run independent of the tree itself. This would allow node trees
@@ -388,7 +388,7 @@ typedef struct bNodeTree {
* as long as necessary, even while the tree is being modified.
*/
struct bNodeTreeExec *execdata;
-
+
/* callbacks */
void (*progress)(void *, float progress);
/** \warning may be called by different threads */
@@ -398,7 +398,7 @@ typedef struct bNodeTree {
void *tbh, *prh, *sdh, *udh;
void *duplilock;
-
+
} bNodeTree;
/* ntree->type, index */
@@ -628,7 +628,7 @@ typedef struct NodeImageMultiFileSocket {
int pad1;
char path[1024]; /* 1024 = FILE_MAX */
ImageFormatData format;
-
+
/* multilayer output */
char layer[30]; /* EXR_TOT_MAXNAME-2 ('.' and channel char are appended) */
char pad2[2];
@@ -700,7 +700,7 @@ typedef struct NodeColorBalance {
float power[3];
float offset_basis;
char _pad[4];
-
+
/* LGG parameters */
float lift[3];
float gamma[3];
diff --git a/source/blender/makesdna/DNA_object_fluidsim_types.h b/source/blender/makesdna/DNA_object_fluidsim_types.h
index b305235083a..b8927613a59 100644
--- a/source/blender/makesdna/DNA_object_fluidsim_types.h
+++ b/source/blender/makesdna/DNA_object_fluidsim_types.h
@@ -38,14 +38,14 @@
#ifdef __cplusplus
extern "C" {
#endif
-
+
struct Mesh;
struct Ipo;
typedef struct FluidVertexVelocity {
float vel[3];
} FluidVertexVelocity;
-
+
typedef struct FluidsimSettings {
struct FluidsimModifierData *fmd; /* for fast RNA access */
/* threadcont the calculation is done with */
@@ -83,7 +83,7 @@ typedef struct FluidsimSettings {
float gstar;
/* activate refinement? */
int maxRefine;
-
+
/* fluid object type settings */
/* gravity strength */
float iniVelx, iniVely, iniVelz;
@@ -127,19 +127,19 @@ typedef struct FluidsimSettings {
struct FluidVertexVelocity *meshVelocities;
/* number of vertices in simulated fluid mesh */
int totvert;
-
+
/* Fluid control settings */
float cpsTimeStart;
float cpsTimeEnd;
float cpsQuality;
-
+
float attractforceStrength;
float attractforceRadius;
float velocityforceStrength;
float velocityforceRadius;
int lastgoodframe;
-
+
/* Simulation/flow rate control (i.e. old "Fac-Time") */
float animRate;
} FluidsimSettings;
diff --git a/source/blender/makesdna/DNA_object_force_types.h b/source/blender/makesdna/DNA_object_force_types.h
index 47467917315..ff8ea1d834d 100644
--- a/source/blender/makesdna/DNA_object_force_types.h
+++ b/source/blender/makesdna/DNA_object_force_types.h
@@ -67,7 +67,7 @@ typedef struct PartDeflect {
short tex_mode; /* texture effector */
short kink, kink_axis; /* for curve guide */
short zdir;
-
+
/* Main effector values */
float f_strength; /* The strength of the force (+ or - ) */
float f_damp; /* Damping ratio of the harmonic effector. */
@@ -93,7 +93,7 @@ typedef struct PartDeflect {
float pdef_stickness;/* surface particle stickiness */
float absorption; /* used for forces */
-
+
/* softbody collisions */
float pdef_sbdamp; /* Damping factor for softbody deflection */
float pdef_sbift; /* inner face thickness for softbody deflection */
@@ -117,7 +117,7 @@ typedef struct PartDeflect {
typedef struct EffectorWeights {
struct Group *group; /* only use effectors from this group of objects */
-
+
float weight[14]; /* effector type specific weights */
float global_gravity;
short flag, rt[3];
@@ -170,7 +170,7 @@ typedef struct PTCacheMem {
typedef struct PointCache {
struct PointCache *next, *prev;
int flag; /* generic flag */
-
+
int step; /* The number of frames between cached frames.
* This should probably be an upper bound for a per point adaptive step in the future,
* buf for now it's the same for all points. Without adaptivity this can effect the perceived
@@ -195,7 +195,7 @@ typedef struct PointCache {
int totpoint; /* number of cached points */
int index; /* modifier stack index */
short compression, rt;
-
+
char name[64];
char prev_name[64];
char info[64];
@@ -273,9 +273,9 @@ typedef struct SoftBody {
char pad;
char msg_lock;
short msg_value;
-
+
/* part of UI: */
-
+
/* general options */
float nodemass; /* softbody mass of *vertex* */
char namedVG_Mass[64]; /* MAX_VGROUP_NAME */
@@ -286,7 +286,7 @@ typedef struct SoftBody {
float mediafrict; /* friction to env */
float rklimit; /* error limit for ODE solver */
float physics_speed;/* user control over simulation speed */
-
+
/* goal */
float goalspring; /* softbody goal springs */
float goalfrict; /* softbody goal springs friction */
@@ -299,7 +299,7 @@ typedef struct SoftBody {
* rather find them by name tag to find it -> jow20090613 */
short fuzzyness; /* */
-
+
/* springs */
float inspring; /* softbody inner springs */
float infrict; /* softbody inner springs friction */
@@ -307,12 +307,12 @@ typedef struct SoftBody {
/* along with it introduce Spring_K painting
* starting to fix old bug .. nastiness that VG are indexes
* rather find them by name tag to find it -> jow20090613 */
-
+
/* baking */
int sfra, efra;
int interval;
short local, solverflags; /* local==1: use local coords for baking */
-
+
/* -- these must be kept for backwards compatibility -- */
SBVertex **keys; /* array of size totpointkey */
int totpointkey, totkey; /* if totpointkey != totpoint or totkey!- (efra-sfra)/interval -> free keys */
@@ -342,7 +342,7 @@ typedef struct SoftBody {
struct Group *collision_group;
struct EffectorWeights *effector_weights;
- /* reverse esimated obmatrix .. no need to store in blend file .. how ever who cares */
+ /* reverse esimated obmatrix .. no need to store in blend file .. how ever who cares */
float lcom[3];
float lrot[3][3];
float lscale[3][3];
@@ -438,9 +438,9 @@ typedef struct SoftBody {
#define OB_SB_AERO_ANGLE 16384
/* sb->solverflags */
-#define SBSO_MONITOR 1
-#define SBSO_OLDERR 2
-#define SBSO_ESTIMATEIPO 4
+#define SBSO_MONITOR 1
+#define SBSO_OLDERR 2
+#define SBSO_ESTIMATEIPO 4
/* sb->sbc_mode */
#define SBC_MODE_MANUAL 0
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h
index ae84108864e..7e6adc6d7df 100644
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@ -116,10 +116,10 @@ typedef struct LodLevel {
typedef struct Object {
ID id;
- struct AnimData *adt; /* animation data (must be immediately after id for utilities to use it) */
+ struct AnimData *adt; /* animation data (must be immediately after id for utilities to use it) */
struct SculptSession *sculpt;
-
+
short type, partype;
int par1, par2, par3; /* can be vertexnrs */
char parsubstr[64]; /* String describing subobject info, MAX_ID_NAME-2 */
@@ -134,13 +134,13 @@ typedef struct Object {
struct bAction *poselib;
struct bPose *pose; /* pose data, armature objects only */
void *data; /* pointer to objects data - an 'ID' or NULL */
-
+
struct bGPdata *gpd; /* Grease Pencil data */
-
+
bAnimVizSettings avs; /* settings for visualization of object-transform animation */
bMotionPath *mpath; /* motion path cache for this object */
void *pad1;
-
+
ListBase constraintChannels DNA_DEPRECATED; // XXX deprecated... old animation system
ListBase effect DNA_DEPRECATED; // XXX deprecated... keep for readfile
ListBase defbase; /* list of bDeformGroup (vertex groups) names and flag only */
@@ -154,7 +154,7 @@ typedef struct Object {
char *matbits; /* a boolean field, with each byte 1 if corresponding material is linked to object */
int totcol; /* copy of mesh, curve & meta struct member of same name (keep in sync) */
int actcol; /* currently selected material in the UI */
-
+
/* rot en drot have to be together! (transform('r' en 's')) */
float loc[3], dloc[3], orig[3];
float size[3]; /* scale in fact */
@@ -171,18 +171,18 @@ typedef struct Object {
/* note: this isn't assured to be valid as with 'obmat',
* before using this value you should do...
* invert_m4_m4(ob->imat, ob->obmat); */
-
+
/* Previously 'imat' was used at render time, but as other places use it too
* the interactive ui of 2.5 creates problems. So now only 'imat_ren' should
* be used when ever the inverse of ob->obmat * re->viewmat is needed! - jahka
*/
float imat_ren[4][4];
-
+
unsigned int lay; /* copy of Base's layer in the scene */
short flag; /* copy of Base */
short colbits DNA_DEPRECATED; /* deprecated, use 'matbits' */
-
+
short transflag, protectflag; /* transformation settings and transform locks */
short trackflag, upflag;
short nlaflag; /* used for DopeSheet filtering settings (expanded/collapsed) */
@@ -200,7 +200,7 @@ typedef struct Object {
/* during realtime */
/* note that inertia is only called inertia for historical reasons
- * and is not changed to avoid DNA surgery. It actually reflects the
+ * and is not changed to avoid DNA surgery. It actually reflects the
* Size value in the GameButtons (= radius) */
float mass, damping, inertia;
@@ -220,7 +220,7 @@ typedef struct Object {
float max_angvel; /* clamp the maximum angular velocity, 0.0 is disabled */
float min_angvel; /* clamp the minimum angular velocity, 0.0 is disabled */
float obstacleRad;
-
+
/* "Character" physics properties */
float step_height;
float jump_speed;
@@ -241,7 +241,7 @@ typedef struct Object {
char empty_drawtype;
float empty_drawsize;
float dupfacesca; /* dupliface scale */
-
+
ListBase prop; /* game logic property list (not to be confused with IDProperties) */
ListBase sensors; /* game logic sensors */
ListBase controllers; /* game logic controllers */
@@ -265,7 +265,7 @@ typedef struct Object {
ListBase nlastrips DNA_DEPRECATED; // XXX deprecated... old animation system
ListBase hooks DNA_DEPRECATED; // XXX deprecated... old animation system
ListBase particlesystem; /* particle systems */
-
+
struct BulletSoftBody *bsoft; /* settings for game engine bullet soft body */
struct PartDeflect *pd; /* particle deflector/attractor/collision data */
struct SoftBody *soft; /* if exists, saved in file */
@@ -290,7 +290,7 @@ typedef struct Object {
ListBase gpulamp; /* runtime, for glsl lamp display only */
ListBase pc_ids;
ListBase *duplilist; /* for temporary dupli list storage, only for use by RNA API */
-
+
struct RigidBodyOb *rigidbody_object; /* settings for Bullet rigid body */
struct RigidBodyCon *rigidbody_constraint; /* settings for Bullet constraint */
@@ -307,13 +307,13 @@ typedef struct Object {
/* Warning, this is not used anymore because hooks are now modifiers */
typedef struct ObHook {
struct ObHook *next, *prev;
-
+
struct Object *parent;
float parentinv[4][4]; /* matrix making current transform unmodified */
float mat[4][4]; /* temp matrix while hooking */
float cent[3]; /* visualization of hook */
float falloff; /* if not zero, falloff is distance where influence zero */
-
+
char name[64]; /* MAX_NAME */
int *indexar;
@@ -677,7 +677,7 @@ enum {
OB_LOCK_ROTW = 1 << 9,
OB_LOCK_ROT4D = 1 << 10,
};
-
+
#define MAX_DUPLI_RECUR 8
#ifdef __cplusplus
diff --git a/source/blender/makesdna/DNA_particle_types.h b/source/blender/makesdna/DNA_particle_types.h
index 9dbd1a18703..f1c22a884f1 100644
--- a/source/blender/makesdna/DNA_particle_types.h
+++ b/source/blender/makesdna/DNA_particle_types.h
@@ -97,7 +97,7 @@ typedef struct ParticleData {
ParticleKey state; /* current global coordinates */
ParticleKey prev_state; /* previous state */
-
+
HairKey *hair; /* hair vertices */
ParticleKey *keys; /* keyed keys */
@@ -297,7 +297,7 @@ typedef struct ParticleSystem {
struct ListBase targets; /* used for keyed and boid physics */
char name[64]; /* particle system name, MAX_NAME */
-
+
float imat[4][4]; /* used for duplicators */
float cfra, tree_frame, bvhtree_frame;
int seed, child_seed;
@@ -375,7 +375,7 @@ typedef enum eParticleDrawFlag {
#define PART_UNBORN 32 /*show unborn particles*/
#define PART_DIED 64 /*show died particles*/
-#define PART_TRAND 128
+#define PART_TRAND 128
#define PART_EDISTR 256 /* particle/face from face areas */
#define PART_ROTATIONS 512 /* calculate particle rotations (and store them in pointcache) */
@@ -410,7 +410,7 @@ typedef enum eParticleDrawFlag {
#define PART_FROM_VERT 0
#define PART_FROM_FACE 1
#define PART_FROM_VOLUME 2
-/* #define PART_FROM_PARTICLE 3 deprecated! */
+/* #define PART_FROM_PARTICLE 3 deprecated! */
#define PART_FROM_CHILD 4
/* part->distr */
diff --git a/source/blender/makesdna/DNA_property_types.h b/source/blender/makesdna/DNA_property_types.h
index 77cd7c3e102..82568e93f54 100644
--- a/source/blender/makesdna/DNA_property_types.h
+++ b/source/blender/makesdna/DNA_property_types.h
@@ -46,7 +46,7 @@ typedef struct bProperty {
short type, flag;
int data; /* data should be 4 bytes to store int,float stuff */
void *poin; /* references data unless its a string which is malloc'd */
-
+
} bProperty;
/* property->type XXX Game Property, not RNA */
diff --git a/source/blender/makesdna/DNA_rigidbody_types.h b/source/blender/makesdna/DNA_rigidbody_types.h
index 381ee5d40e5..6792978463f 100644
--- a/source/blender/makesdna/DNA_rigidbody_types.h
+++ b/source/blender/makesdna/DNA_rigidbody_types.h
@@ -52,23 +52,23 @@ typedef struct RigidBodyWorld {
struct Group *group; /* Group containing objects to use for Rigid Bodies */
struct Object **objects; /* Array to access group objects by index, only used at runtime */
-
+
struct Group *constraints; /* Group containing objects to use for Rigid Body Constraints*/
int pad;
float ltime; /* last frame world was evaluated for (internal) */
-
+
/* cache */
struct PointCache *pointcache;
struct ListBase ptcaches;
int numbodies; /* number of objects in rigid body group */
-
+
short steps_per_second; /* number of simulation steps thaken per second */
short num_solver_iterations;/* number of constraint solver iterations made per simulation step */
-
+
int flag; /* (eRigidBodyWorld_Flag) settings for this RigidBodyWorld */
float time_scale; /* used to speed up or slow down the simulation */
-
+
/* References to Physics Sim objects. Exist at runtime only ---------------------- */
void *physics_world; /* Physics sim world (i.e. btDiscreteDynamicsWorld) */
} RigidBodyWorld;
@@ -96,30 +96,30 @@ typedef struct RigidBodyOb {
/* References to Physics Sim objects. Exist at runtime only */
void *physics_object; /* Physics object representation (i.e. btRigidBody) */
void *physics_shape; /* Collision shape used by physics sim (i.e. btCollisionShape) */
-
+
/* General Settings for this RigidBodyOb */
short type; /* (eRigidBodyOb_Type) role of RigidBody in sim */
- short shape; /* (eRigidBody_Shape) collision shape to use */
-
+ short shape; /* (eRigidBody_Shape) collision shape to use */
+
int flag; /* (eRigidBodyOb_Flag) */
int col_groups; /* Collision groups that determines wich rigid bodies can collide with each other */
short mesh_source; /* (eRigidBody_MeshSource) mesh source for mesh based collision shapes */
short pad;
-
+
/* Physics Parameters */
float mass; /* how much object 'weighs' (i.e. absolute 'amount of stuff' it holds) */
-
+
float friction; /* resistance of object to movement */
float restitution; /* how 'bouncy' object is when it collides */
-
- float margin; /* tolerance for detecting collisions */
-
+
+ float margin; /* tolerance for detecting collisions */
+
float lin_damping; /* damping for linear velocities */
float ang_damping; /* damping for angular velocities */
-
+
float lin_sleep_thresh; /* deactivation threshold for linear velocities */
float ang_sleep_thresh; /* deactivation threshold for angular velocities */
-
+
float orn[4]; /* rigid body orientation */
float pos[3]; /* rigid body position */
float pad1;
@@ -166,12 +166,12 @@ typedef enum eRigidBody_Shape {
RB_SHAPE_CYLINDER,
/* cone (i.e. party hat) */
RB_SHAPE_CONE,
-
+
/* convex hull (minimal shrinkwrap encompassing all verts) */
RB_SHAPE_CONVEXH,
/* triangulated mesh */
RB_SHAPE_TRIMESH,
-
+
/* concave mesh approximated using primitives */
//RB_SHAPE_COMPOUND,
} eRigidBody_Shape;
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index d2b71c727c5..2a62adae21f 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -188,12 +188,12 @@ typedef struct AudioData {
/* Render Layer */
typedef struct SceneRenderLayer {
struct SceneRenderLayer *next, *prev;
-
+
char name[64]; /* MAX_NAME */
-
+
struct Material *mat_override;
struct Group *light_override;
-
+
unsigned int lay; /* Scene.lay itself has priority over this */
unsigned int lay_zmask; /* has to be after lay, this is for Z-masking */
unsigned int lay_exclude; /* not used by internal, exclude */
@@ -560,7 +560,7 @@ typedef enum eBakePassFilter {
typedef struct RenderData {
struct ImageFormatData im_format;
-
+
struct AviCodecData *avicodecdata;
struct FFMpegCodecData ffcodecdata;
@@ -587,13 +587,13 @@ typedef struct RenderData {
int frame_step; /* frames to jump during render/playback */
short stereomode DNA_DEPRECATED; /* standalone player stereo settings */ // XXX deprecated since 2.5
-
+
short dimensionspreset; /* for the dimensions presets menu */
short filtertype; /* filter is box, tent, gauss, mitch, etc */
short size; /* size in % */
-
+
short maximsize DNA_DEPRECATED; /* max in Kb */
short pad6;
@@ -623,7 +623,7 @@ typedef struct RenderData {
int tilex, tiley;
short planes DNA_DEPRECATED, imtype DNA_DEPRECATED, subimtype DNA_DEPRECATED, quality DNA_DEPRECATED; /*deprecated!*/
-
+
/**
* Render to image editor, fullscreen or to new window.
*/
@@ -645,7 +645,7 @@ typedef struct RenderData {
* Flags for raytrace settings. Use bit-masking to access the settings.
*/
int raytrace_options;
-
+
/**
* Raytrace acceleration structure
*/
@@ -656,7 +656,7 @@ typedef struct RenderData {
/* octree resolution */
short ocres;
short pad4;
-
+
/**
* What to do with the sky/background. Picks sky/premul/key
* blending for the background
@@ -670,39 +670,39 @@ typedef struct RenderData {
short frs_sec, edgeint;
-
+
/* safety, border and display rect */
rctf safety, border;
rcti disprect;
-
+
/* information on different layers to be rendered */
ListBase layers;
short actlay;
-
+
/* number of mblur samples */
short mblur_samples;
-
+
/**
* Adjustment factors for the aspect ratio in the x direction, was a short in 2.45
*/
float xasp, yasp;
float frs_sec_base;
-
+
/**
* Value used to define filter size for all filter options */
float gauss;
-
-
+
+
/* color management settings - color profiles, gamma correction, etc */
int color_mgt_flag;
-
+
/** post-production settings. deprecated, but here for upwards compat (initialized to 1) */
float postgamma, posthue, postsat;
-
+
/* Dither noise intensity */
float dither_intensity;
-
+
/* Bake Render options */
short bake_osa, bake_filter, bake_mode, bake_flag;
short bake_normal_space, bake_quad_split;
@@ -742,7 +742,7 @@ typedef struct RenderData {
/* cineon */
short cineonwhite DNA_DEPRECATED, cineonblack DNA_DEPRECATED; /*deprecated*/
float cineongamma DNA_DEPRECATED; /*deprecated*/
-
+
/* jpeg2000 */
short jp2_preset DNA_DEPRECATED, jp2_depth DNA_DEPRECATED; /*deprecated*/
int rpad3;
@@ -789,14 +789,14 @@ typedef struct RenderData {
typedef struct RenderProfile {
struct RenderProfile *next, *prev;
char name[32];
-
+
short particle_perc;
short subsurf_max;
short shadbufsample_max;
short pad1;
-
+
float ao_error, pad2;
-
+
} RenderProfile;
/* *************************************************************** */
@@ -1033,7 +1033,7 @@ typedef struct Paint {
/* Paint stroke can use up to PAINT_MAX_INPUT_SAMPLES inputs to
* smooth the stroke */
int num_input_samples;
-
+
/* flags used for symmetry */
int symmetry_flags;
@@ -1049,7 +1049,7 @@ typedef struct ImagePaintSettings {
Paint paint;
short flag, missing_data;
-
+
/* for projection painting only */
short seam_bleed, normal_angle;
short screen_grab_size[2]; /* capture size for re-projection */
@@ -1192,10 +1192,10 @@ typedef enum eGP_EditBrush_Flag {
GP_EDITBRUSH_FLAG_INVERT = (1 << 0),
/* adjust strength using pen pressure */
GP_EDITBRUSH_FLAG_USE_PRESSURE = (1 << 1),
-
+
/* strength of brush falls off with distance from cursor */
GP_EDITBRUSH_FLAG_USE_FALLOFF = (1 << 2),
-
+
/* smooth brush affects pressure values as well */
GP_EDITBRUSH_FLAG_SMOOTH_PRESSURE = (1 << 3)
} eGP_EditBrush_Flag;
@@ -1206,7 +1206,7 @@ typedef enum eGP_EditBrush_Flag {
typedef struct GP_BrushEdit_Settings {
GP_EditBrush_Data brush[11]; /* TOT_GP_EDITBRUSH_TYPES */
void *paintcursor; /* runtime */
-
+
int brushtype; /* eGP_EditBrush_Types */
int flag; /* eGP_BrushEdit_SettingsFlag */
int lock_axis; /* eGP_Lockaxis_Types lock drawing to one axis */
@@ -1229,13 +1229,13 @@ typedef enum eGP_BrushEdit_SettingsFlag {
/* Settings for GP Interpolation Operators */
typedef struct GP_Interpolate_Settings {
short flag; /* eGP_Interpolate_SettingsFlag */
-
- char type; /* eGP_Interpolate_Type - Interpolation Mode */
+
+ char type; /* eGP_Interpolate_Type - Interpolation Mode */
char easing; /* eBezTriple_Easing - Easing mode (if easing equation used) */
-
+
float back; /* BEZT_IPO_BACK */
float amplitude, period; /* BEZT_IPO_ELASTIC */
-
+
struct CurveMapping *custom_ipo; /* custom interpolation curve (for use with GP_IPO_CURVEMAP) */
} GP_Interpolate_Settings;
@@ -1251,10 +1251,10 @@ typedef enum eGP_Interpolate_SettingsFlag {
typedef enum eGP_Interpolate_Type {
/* Traditional Linear Interpolation */
GP_IPO_LINEAR = 0,
-
+
/* CurveMap Defined Interpolation */
GP_IPO_CURVEMAP = 1,
-
+
/* Easing Equations */
GP_IPO_BACK = 3,
GP_IPO_BOUNCE = 4,
@@ -1312,11 +1312,11 @@ typedef struct UnifiedPaintSettings {
/* record movement of mouse so that rake can start at an intuitive angle */
float last_rake[2];
float last_rake_angle;
-
+
int last_stroke_valid;
float average_stroke_accum[3];
int average_stroke_counter;
-
+
float brush_rotation;
float brush_rotation_sec;
@@ -1452,7 +1452,7 @@ typedef struct ToolSettings {
VPaint *wpaint; /* weight paint */
Sculpt *sculpt;
UvSculpt *uvsculpt; /* uv smooth */
-
+
/* Vertex group weight - used only for editmode, not weight
* paint */
float vgroup_weight;
@@ -1483,22 +1483,22 @@ typedef struct ToolSettings {
char gpencil_v2d_align; /* : General 2D Editor */
char gpencil_seq_align; /* : Sequencer Preview */
char gpencil_ima_align; /* : Image Editor */
-
+
/* Grease Pencil Sculpt */
struct GP_BrushEdit_Settings gp_sculpt;
-
+
/* Grease Pencil Interpolation Tool(s) */
struct GP_Interpolate_Settings gp_interpolate;
-
+
/* Grease Pencil Drawing Brushes (bGPDbrush) */
- ListBase gp_brushes;
+ ListBase gp_brushes;
/* Image Paint (8 byttse aligned please!) */
struct ImagePaintSettings imapaint;
/* Particle Editing */
struct ParticleEditSettings particle;
-
+
/* Transform Proportional Area of Effect */
float proportional_size;
@@ -1539,7 +1539,7 @@ typedef struct ToolSettings {
char skgen_retarget_roll;
char skgen_side_string[8];
char skgen_num_string[8];
-
+
/* Alt+RMB option */
char edge_mode;
char edge_mode_live_unwrap;
@@ -1632,33 +1632,33 @@ typedef struct DisplaySafeAreas {
typedef struct Scene {
ID id;
- struct AnimData *adt; /* animation data (must be immediately after id for utilities to use it) */
-
+ struct AnimData *adt; /* animation data (must be immediately after id for utilities to use it) */
+
struct Object *camera;
struct World *world;
-
+
struct Scene *set;
-
+
ListBase base;
struct Base *basact; /* active base */
struct Object *obedit; /* name replaces old G.obedit */
-
+
float cursor[3]; /* 3d cursor location */
char _pad[4];
-
+
unsigned int lay; /* bitflags for layer visibility */
int layact; /* active layer */
unsigned int lay_updated; /* runtime flag, has layer ever been updated since load? */
-
+
short flag; /* various settings */
-
+
char use_nodes;
char pad[1];
-
+
struct bNodeTree *nodetree;
-
+
struct Editing *ed; /* sequence editor data is allocated here */
-
+
struct ToolSettings *toolsettings; /* default allocated now */
struct SceneStats *stats; /* default allocated now */
struct DisplaySafeAreas safe_areas;
@@ -1667,17 +1667,17 @@ typedef struct Scene {
/* no, is on the right place (ton) */
struct RenderData r;
struct AudioData audio;
-
+
ListBase markers;
ListBase transform_spaces;
-
+
void *sound_scene;
void *playback_handle;
void *sound_scrub_handle;
void *speaker_handles;
-
+
void *fps_info; /* (runtime) info/cache used for presenting playback framerate info to the user */
-
+
/* none of the dependency graph vars is mean to be saved */
struct Depsgraph *depsgraph;
void *pad1;
@@ -1688,14 +1688,14 @@ typedef struct Scene {
/* User-Defined KeyingSets */
int active_keyingset; /* index of the active KeyingSet. first KeyingSet has index 1, 'none' active is 0, 'add new' is -1 */
ListBase keyingsets; /* KeyingSets for this scene */
-
+
/* Game Settings */
struct GameFraming framing DNA_DEPRECATED; // XXX deprecated since 2.5
struct GameData gm;
/* Units */
struct UnitSettings unit;
-
+
/* Grease Pencil */
struct bGPdata *gpd;
@@ -1712,7 +1712,7 @@ typedef struct Scene {
ColorManagedViewSettings view_settings;
ColorManagedDisplaySettings display_settings;
ColorManagedColorspaceSettings sequencer_colorspace_settings;
-
+
/* RigidBody simulation world+settings */
struct RigidBodyWorld *rigidbody_world;
@@ -1754,7 +1754,7 @@ typedef struct Scene {
/* threads obsolete... is there for old files, now use for autodetect threads */
#define R_THREADS 0x80000
/* Use the same flag for autothreads */
-#define R_FIXED_THREADS 0x80000
+#define R_FIXED_THREADS 0x80000
#define R_SPEED 0x100000
#define R_SSS 0x200000
@@ -2218,14 +2218,14 @@ typedef enum eGPencil_Source_3D {
typedef enum eGPencil_Placement_Flags {
/* New strokes are added in viewport/data space (i.e. not screen space) */
GP_PROJECT_VIEWSPACE = (1 << 0),
-
+
/* Viewport space, but relative to render canvas (Sequencer Preview Only) */
GP_PROJECT_CANVAS = (1 << 1),
-
+
/* Project into the screen's Z values */
GP_PROJECT_DEPTH_VIEW = (1 << 2),
GP_PROJECT_DEPTH_STROKE = (1 << 3),
-
+
/* "Use Endpoints" */
GP_PROJECT_DEPTH_STROKE_ENDPOINTS = (1 << 4),
} eGPencil_Placement_Flags;
diff --git a/source/blender/makesdna/DNA_screen_types.h b/source/blender/makesdna/DNA_screen_types.h
index a9767f506dc..6fa4648df37 100644
--- a/source/blender/makesdna/DNA_screen_types.h
+++ b/source/blender/makesdna/DNA_screen_types.h
@@ -48,7 +48,7 @@ struct wmTooltipState;
typedef struct bScreen {
ID id;
-
+
ListBase vertbase; /* screens have vertices/edges to define areas */
ListBase edgebase;
ListBase areabase;
@@ -71,7 +71,7 @@ typedef struct bScreen {
char skip_handling; /* set to delay screen handling after switching back from maximized area */
char scrubbing; /* set when scrubbing to avoid some costly updates */
char pad[6];
-
+
short mainwin; /* screensize subwindow, for screenedges and global menus */
short subwinactive; /* active subwindow */
@@ -204,7 +204,7 @@ typedef struct uiPreview { /* some preview UI data need to be saved in
typedef struct ScrArea {
struct ScrArea *next, *prev;
-
+
ScrVert *v1, *v2, *v3, *v4; /* ordered (bl, tl, tr, br) */
bScreen *full; /* if area==full, this is the parent */
@@ -212,14 +212,14 @@ typedef struct ScrArea {
char spacetype, butspacetype; /* SPACE_..., butspacetype is button arg */
short winx, winy; /* size */
-
+
short headertype; /* OLD! 0=no header, 1= down, 2= up */
short do_refresh; /* private, for spacetype refresh callback */
short flag;
short region_active_win; /* index of last used region of 'RGN_TYPE_WINDOW'
* runtime variable, updated by executing operators */
char temp, pad;
-
+
struct SpaceType *type; /* callbacks for this space type */
/* A list of space links (editors) that were open in this area before. When
@@ -238,29 +238,29 @@ typedef struct ScrArea {
typedef struct ARegion {
struct ARegion *next, *prev;
-
+
View2D v2d; /* 2D-View scrolling/zoom info (most regions are 2d anyways) */
rcti winrct; /* coordinates of region */
rcti drawrct; /* runtime for partial redraw, same or smaller than winrct */
short winx, winy; /* size */
-
+
short swinid;
short regiontype; /* window, header, etc. identifier for drawing */
short alignment; /* how it should split */
short flag; /* hide, ... */
-
+
float fsize; /* current split size in float (unused) */
short sizex, sizey; /* current split size in pixels (if zero it uses regiontype) */
-
+
short do_draw; /* private, cached notifier events */
short do_draw_overlay; /* private, cached notifier events */
short swap; /* private, indicator to survive swap-exchange */
short overlap; /* private, set for indicate drawing overlapped */
short flagfullscreen; /* temporary copy of flag settings for clean fullscreen */
short pad;
-
+
struct ARegionType *type; /* callbacks for this region type */
-
+
ListBase uiblocks; /* uiBlock */
ListBase panels; /* Panel */
ListBase panels_category_active; /* Stack of panel categories */
@@ -268,9 +268,9 @@ typedef struct ARegion {
ListBase ui_previews; /* uiPreview */
ListBase handlers; /* wmEventHandler */
ListBase panels_category; /* Panel categories runtime */
-
+
struct wmTimer *regiontimer; /* blend in/out */
-
+
char *headerstr; /* use this string to draw info */
void *regiondata; /* XXX 2.50, need spacedata equivalent? */
} ARegion;
diff --git a/source/blender/makesdna/DNA_sensor_types.h b/source/blender/makesdna/DNA_sensor_types.h
index 37064854920..1fee490319f 100644
--- a/source/blender/makesdna/DNA_sensor_types.h
+++ b/source/blender/makesdna/DNA_sensor_types.h
@@ -52,7 +52,7 @@ typedef struct bNearSensor {
*/
typedef struct bMouseSensor {
/**
- * The type of key this sensor listens to.
+ * The type of key this sensor listens to.
*/
short type;
short flag;
@@ -167,9 +167,9 @@ typedef struct bSensor {
short freq, totlinks, pad1, pad2; /* freq makes reference to skipped ticks between 2 active pulses */
char name[64]; /* MAX_NAME */
void *data;
-
+
struct bController **links;
-
+
struct Object *ob;
/* just add here, to avoid align errors... */
diff --git a/source/blender/makesdna/DNA_sequence_types.h b/source/blender/makesdna/DNA_sequence_types.h
index b7e118d2053..ef076c98b5f 100644
--- a/source/blender/makesdna/DNA_sequence_types.h
+++ b/source/blender/makesdna/DNA_sequence_types.h
@@ -215,7 +215,7 @@ typedef struct Editing {
ListBase *seqbasep; /* pointer to the current list of seq's being edited (can be within a meta strip) */
ListBase seqbase; /* pointer to the top-most seq's */
ListBase metastack;
-
+
/* Context vars, used to be static */
Sequence *act_seq;
char act_imagedir[1024]; /* 1024 = FILE_MAX */
@@ -233,7 +233,7 @@ typedef struct WipeVars {
short forward, wipetype;
} WipeVars;
-typedef struct GlowVars {
+typedef struct GlowVars {
float fMini; /* Minimum intensity to trigger a glow */
float fClamp;
float fBoost; /* Amount to multiply glow intensity */
@@ -439,7 +439,7 @@ enum {
SEQ_AUDIO_PITCH_ANIMATED = (1 << 25),
SEQ_AUDIO_PAN_ANIMATED = (1 << 26),
SEQ_AUDIO_DRAW_WAVEFORM = (1 << 27),
-
+
/* don't include Grease Pencil in OpenGL previews of Scene strips */
SEQ_SCENE_NO_GPENCIL = (1 << 28),
SEQ_USE_VIEWS = (1 << 29),
diff --git a/source/blender/makesdna/DNA_smoke_types.h b/source/blender/makesdna/DNA_smoke_types.h
index c1565bde882..d74d46aebbd 100644
--- a/source/blender/makesdna/DNA_smoke_types.h
+++ b/source/blender/makesdna/DNA_smoke_types.h
@@ -174,7 +174,7 @@ typedef struct SmokeDomainSettings {
int flags; /* show up-res or low res, etc */
int viewsettings;
short noise; /* noise type: wave, curl, anisotropic */
- short diss_percent;
+ short diss_percent;
int diss_speed;/* in frames */
float strength;
int res_wt[3];
diff --git a/source/blender/makesdna/DNA_speaker_types.h b/source/blender/makesdna/DNA_speaker_types.h
index 8ad987818ae..f7bc3b41e55 100644
--- a/source/blender/makesdna/DNA_speaker_types.h
+++ b/source/blender/makesdna/DNA_speaker_types.h
@@ -34,7 +34,7 @@ struct bSound;
typedef struct Speaker {
ID id;
- struct AnimData *adt; /* animation data (must be immediately after id for utilities to use it) */
+ struct AnimData *adt; /* animation data (must be immediately after id for utilities to use it) */
struct bSound *sound;
diff --git a/source/blender/makesdna/DNA_text_types.h b/source/blender/makesdna/DNA_text_types.h
index 163dda678d9..78902598fdb 100644
--- a/source/blender/makesdna/DNA_text_types.h
+++ b/source/blender/makesdna/DNA_text_types.h
@@ -49,16 +49,16 @@ typedef struct TextLine {
typedef struct Text {
ID id;
-
+
char *name;
void *compiled;
int flags, nlines;
-
+
ListBase lines;
TextLine *curl, *sell;
int curc, selc;
-
+
double mtime;
} Text;
diff --git a/source/blender/makesdna/DNA_texture_types.h b/source/blender/makesdna/DNA_texture_types.h
index 0eb54a9b5b3..618b446a99f 100644
--- a/source/blender/makesdna/DNA_texture_types.h
+++ b/source/blender/makesdna/DNA_texture_types.h
@@ -60,7 +60,7 @@ typedef struct MTex {
struct Object *object;
struct Tex *tex;
char uvname[64]; /* MAX_CUSTOMDATA_LAYER_NAME */
-
+
char projx, projy, projz, mapping;
char brush_map_mode, brush_angle_mode;
char pad[2];
@@ -70,10 +70,10 @@ typedef struct MTex {
short normapspace, which_output;
float r, g, b, k;
float def_var, rt;
-
+
/* common */
float colfac, varfac;
-
+
/* material */
float norfac, dispfac, warpfac;
float colspecfac, mirrfac, alphafac;
@@ -144,10 +144,10 @@ typedef struct PointDensity {
float radius;
short source;
short pad0;
-
+
short color_source; /* psys_color_source */
short ob_color_source;
-
+
int totpoints;
struct Object *object; /* for 'Object' or 'Particle system' type - source object */
@@ -155,20 +155,20 @@ typedef struct PointDensity {
short psys_cache_space; /* cache points in worldspace, object space, ... ? */
short ob_cache_space; /* cache points in worldspace, object space, ... ? */
char vertex_attribute_name[64]; /* vertex attribute layer for color source, MAX_CUSTOMDATA_LAYER_NAME */
-
+
void *point_tree; /* the acceleration tree containing points */
float *point_data; /* dynamically allocated extra for extra information, like particle age */
-
+
float noise_size;
short noise_depth;
short noise_influence;
short noise_basis;
short pad1[3];
float noise_fac;
-
+
float speed_scale, falloff_speed_scale, pad2;
struct ColorBand *coba; /* for time -> color */
-
+
struct CurveMapping *falloff_curve; /* falloff density curve */
} PointDensity;
@@ -182,7 +182,7 @@ typedef struct VoxelData {
short hair_type;
short data_type;
int _pad;
-
+
struct Object *object; /* for rendering smoke sims */
float int_multiplier;
int still_frame;
@@ -192,22 +192,22 @@ typedef struct VoxelData {
float *dataset;
int cachedframe;
int ok;
-
+
} VoxelData;
typedef struct OceanTex {
struct Object *object;
char oceanmod[64];
-
+
int output;
int pad;
-
+
} OceanTex;
-
+
typedef struct Tex {
ID id;
- struct AnimData *adt; /* animation data (must be immediately after id for utilities to use it) */
-
+ struct AnimData *adt; /* animation data (must be immediately after id for utilities to use it) */
+
float noisesize, turbul;
float bright, contrast, saturation, rfac, gfac, bfac;
float filtersize, pad2;
@@ -233,7 +233,7 @@ typedef struct Tex {
short imaflag, flag;
short type, stype;
-
+
float cropxmin, cropymin, cropxmax, cropymax;
int texfilter;
int afmax; // anisotropic filter maximum value, ewa -> max eccentricity, feline -> max probes
@@ -244,12 +244,12 @@ typedef struct Tex {
short fie_ima;
int len;
int frames, offset, sfra;
-
+
float checkerdist, nabla;
float pad1;
-
+
struct ImageUser iuser;
-
+
struct bNodeTree *nodetree;
struct Ipo *ipo DNA_DEPRECATED; /* old animation system, deprecated for 2.5 */
struct Image *ima;
@@ -259,10 +259,10 @@ typedef struct Tex {
struct PointDensity *pd;
struct VoxelData *vd;
struct OceanTex *ot;
-
+
char use_nodes;
char pad[7];
-
+
} Tex;
/* used for mapping and texture nodes. note: rot is now in radians */
@@ -272,7 +272,7 @@ typedef struct TexMapping {
int flag;
char projx, projy, projz, mapping;
int type;
-
+
float mat[4][4];
float min[3], max[3];
struct Object *ob;
@@ -390,7 +390,7 @@ typedef struct ColorMapping {
#define TEX_PRV_NOR 64
#define TEX_REPEAT_XMIR 128
#define TEX_REPEAT_YMIR 256
-#define TEX_FLAG_MASK ( TEX_COLORBAND | TEX_FLIPBLEND | TEX_NEGALPHA | TEX_CHECKER_ODD | TEX_CHECKER_EVEN | TEX_PRV_ALPHA | TEX_PRV_NOR | TEX_REPEAT_XMIR | TEX_REPEAT_YMIR )
+#define TEX_FLAG_MASK ( TEX_COLORBAND | TEX_FLIPBLEND | TEX_NEGALPHA | TEX_CHECKER_ODD | TEX_CHECKER_EVEN | TEX_PRV_ALPHA | TEX_PRV_NOR | TEX_REPEAT_XMIR | TEX_REPEAT_YMIR )
#define TEX_DS_EXPAND 512
#define TEX_NO_CLAMP 1024
@@ -508,7 +508,7 @@ typedef struct ColorMapping {
#define MTEX_BLEND_SAT 11
#define MTEX_BLEND_VAL 12
#define MTEX_BLEND_COLOR 13
-#define MTEX_SOFT_LIGHT 15
+#define MTEX_SOFT_LIGHT 15
#define MTEX_LIN_LIGHT 16
/* brush_map_mode */
@@ -655,13 +655,13 @@ enum {
#define TEX_OCN_DISPLACEMENT 1
#define TEX_OCN_FOAM 2
#define TEX_OCN_JPLUS 3
-#define TEX_OCN_EMINUS 4
+#define TEX_OCN_EMINUS 4
#define TEX_OCN_EPLUS 5
/* flag */
-#define TEX_OCN_GENERATE_NORMALS 1
-#define TEX_OCN_XZ 2
-
+#define TEX_OCN_GENERATE_NORMALS 1
+#define TEX_OCN_XZ 2
+
#ifdef __cplusplus
}
#endif
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h
index a7759a1d143..0a9f715f86b 100644
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@ -53,7 +53,7 @@ struct ColorBand;
typedef enum eUIFont_ID {
UIFONT_DEFAULT = 0,
/* UIFONT_BITMAP = 1 */ /* UNUSED */
-
+
/* free slots */
UIFONT_CUSTOM1 = 2,
UIFONT_CUSTOM2 = 3
@@ -97,16 +97,16 @@ typedef enum eFontStyle_Align {
typedef struct uiStyle {
struct uiStyle *next, *prev;
-
+
char name[64]; /* MAX_STYLE_NAME */
-
+
uiFontStyle paneltitle;
uiFontStyle grouplabel;
uiFontStyle widgetlabel;
uiFontStyle widget;
-
+
float panelzoom;
-
+
short minlabelchars; /* in characters */
short minwidgetchars; /* in characters */
@@ -165,7 +165,7 @@ typedef struct ThemeUI {
uiWidgetColors wcol_num, wcol_numslider;
uiWidgetColors wcol_menu, wcol_pulldown, wcol_menu_back, wcol_menu_item, wcol_tooltip;
uiWidgetColors wcol_box, wcol_scroll, wcol_progress, wcol_list_item, wcol_pie_menu;
-
+
uiWidgetStateColors wcol_state;
uiPanelColors panel; /* depricated, but we keep it for do_versions (2.66.1) */
@@ -175,9 +175,9 @@ typedef struct ThemeUI {
/* fac: 0 - 1 for blend factor, width in pixels */
float menu_shadow_fac;
short menu_shadow_width;
-
+
short pad[3];
-
+
char iconfile[256]; // FILE_MAXFILE length
float icon_alpha;
@@ -194,7 +194,7 @@ typedef struct ThemeSpace {
char title[4]; /* panel title */
char text[4];
char text_hi[4];
-
+
/* header colors */
char header[4]; /* region background */
char header_title[4]; /* unused */
@@ -212,19 +212,19 @@ typedef struct ThemeSpace {
char button_title[4]; /* panel title */
char button_text[4];
char button_text_hi[4];
-
+
/* listview regions */
char list[4]; /* region background */
char list_title[4]; /* panel title */
char list_text[4];
char list_text_hi[4];
-
+
/* float panel */
/* char panel[4]; unused */
/* char panel_title[4]; unused */
/* char panel_text[4]; unused */
/* char panel_text_hi[4]; unused */
-
+
/* note, cannot use name 'panel' because of DNA mapping old files */
uiPanelColors panelcolors;
@@ -232,10 +232,10 @@ typedef struct ThemeSpace {
char shade1[4];
char shade2[4];
-
+
char hilite[4];
- char grid[4];
-
+ char grid[4];
+
char view_overlay[4];
char wire[4], wire_edit[4], select[4];
@@ -255,58 +255,58 @@ typedef struct ThemeSpace {
char cframe[4];
char time_keyframe[4], time_gp_keyframe[4];
char freestyle_edge_mark[4], freestyle_face_mark[4];
-
+
char nurb_uline[4], nurb_vline[4];
char act_spline[4], nurb_sel_uline[4], nurb_sel_vline[4], lastsel_point[4];
-
+
char handle_free[4], handle_auto[4], handle_vect[4], handle_align[4], handle_auto_clamped[4];
char handle_sel_free[4], handle_sel_auto[4], handle_sel_vect[4], handle_sel_align[4], handle_sel_auto_clamped[4];
-
+
char ds_channel[4], ds_subchannel[4]; /* dopesheet */
char keytype_keyframe[4], keytype_extreme[4], keytype_breakdown[4], keytype_jitter[4]; /* keytypes */
char keytype_keyframe_select[4], keytype_extreme_select[4], keytype_breakdown_select[4], keytype_jitter_select[4]; /* keytypes */
char keyborder[4], keyborder_select[4];
-
+
char console_output[4], console_input[4], console_info[4], console_error[4];
char console_cursor[4], console_select[4];
-
+
char vertex_size, outline_width, facedot_size;
char noodle_curving;
/* syntax for textwindow and nodes */
- char syntaxl[4], syntaxs[4]; // in nodespace used for backdrop matte
+ char syntaxl[4], syntaxs[4]; // in nodespace used for backdrop matte
char syntaxb[4], syntaxn[4]; // in nodespace used for color input
char syntaxv[4], syntaxc[4]; // in nodespace used for converter group
- char syntaxd[4], syntaxr[4]; // in nodespace used for distort
+ char syntaxd[4], syntaxr[4]; // in nodespace used for distort
char nodeclass_output[4], nodeclass_filter[4];
char nodeclass_vector[4], nodeclass_texture[4];
char nodeclass_shader[4], nodeclass_script[4];
char nodeclass_pattern[4], nodeclass_layout[4];
-
+
char movie[4], movieclip[4], mask[4], image[4], scene[4], audio[4]; /* for sequence editor */
char effect[4], transition[4], meta[4], text_strip[4];
-
+
float keyframe_scale_fac; /* for dopesheet - scale factor for size of keyframes (i.e. height of channels) */
-
- char editmesh_active[4];
+
+ char editmesh_active[4];
char handle_vertex[4];
char handle_vertex_select[4];
-
+
char handle_vertex_size;
char clipping_border_3d[4];
-
+
char marker_outline[4], marker[4], act_marker[4], sel_marker[4], dis_marker[4], lock_marker[4];
char bundle_solid[4];
char path_before[4], path_after[4];
char camera_path[4];
char hpad[2];
-
+
char gp_vertex_size;
char gp_vertex[4], gp_vertex_select[4];
-
+
char preview_back[4];
char preview_stitch_face[4];
char preview_stitch_edge[4];
@@ -314,7 +314,7 @@ typedef struct ThemeSpace {
char preview_stitch_stitchable[4];
char preview_stitch_unstitchable[4];
char preview_stitch_active[4];
-
+
char uv_shadow[4]; /* two uses, for uvs with modifier applied on mesh and uvs during painting */
char uv_others[4]; /* uvs of other objects */
@@ -322,14 +322,14 @@ typedef struct ThemeSpace {
char selected_highlight[4]; /* outliner - selected item */
char skin_root[4]; /* Skin modifier root color */
-
+
/* NLA */
char anim_active[4]; /* Active Action + Summary Channel */
char anim_non_active[4]; /* Active Action = NULL */
-
+
char nla_tweaking[4]; /* NLA 'Tweaking' action/strip */
char nla_tweakdupli[4]; /* NLA - warning color for duplicate instances of tweaking strip */
-
+
char nla_transition[4], nla_transition_sel[4]; /* NLA "Transition" strips */
char nla_meta[4], nla_meta_sel[4]; /* NLA "Meta" strips */
char nla_sound[4], nla_sound_sel[4]; /* NLA "Sound" strips */
@@ -354,10 +354,10 @@ typedef struct ThemeWireColor {
char solid[4];
char select[4];
char active[4];
-
+
short flag; /* eWireColor_Flags */
short pad;
-} ThemeWireColor;
+} ThemeWireColor;
/* ThemeWireColor.flag */
typedef enum eWireColor_Flags {
@@ -369,9 +369,9 @@ typedef enum eWireColor_Flags {
typedef struct bTheme {
struct bTheme *next, *prev;
char name[32];
-
+
ThemeUI tui;
-
+
/* Individual Spacetypes */
/* note: ensure UI_THEMESPACE_END is updated when adding */
ThemeSpace tbuts;
@@ -391,11 +391,11 @@ typedef struct bTheme {
ThemeSpace tuserpref;
ThemeSpace tconsole;
ThemeSpace tclip;
-
+
/* 20 sets of bone colors for this theme */
ThemeWireColor tarm[20];
/*ThemeWireColor tobj[20];*/
-
+
int active_theme_area, pad;
} bTheme;
@@ -433,7 +433,7 @@ typedef struct WalkNavigation {
typedef struct UserDef {
/* UserDef has separate do-version handling, and can be read from other files */
int versionfile, subversionfile;
-
+
int flag; /* eUserPref_Flag */
int dupflag; /* eDupli_ID_Flags */
int savetime;
@@ -449,13 +449,13 @@ typedef struct UserDef {
char image_editor[1024]; /* 1024 = FILE_MAX */
char anim_player[1024]; /* 1024 = FILE_MAX */
int anim_player_preset;
-
+
short v2d_min_gridsize; /* minimum spacing between gridlines in View2D grids */
short timecode_style; /* eTimecodeStyles, style of timecode display */
-
+
short versions;
short dbl_click_time;
-
+
short gameflags;
short wheellinescroll;
int uiflag; /* eUserpref_UI_Flag */
@@ -465,7 +465,7 @@ typedef struct UserDef {
short app_flag;
short language;
short userpref, viewzoom;
-
+
int mixbufsize;
int audiodevice;
int audiorate;
@@ -492,7 +492,7 @@ typedef struct UserDef {
struct ListBase addons;
struct ListBase autoexec_paths;
char keyconfigstr[64];
-
+
short undosteps;
short pad1;
int undomemory;
@@ -529,7 +529,7 @@ typedef struct UserDef {
short scrcastfps; /* frame rate for screencast to be played back */
short scrcastwait; /* milliseconds between screencast snapshots */
-
+
short widget_unit; /* private, defaults to 20 for 72 DPI setting */
short anisotropic_filter;
short use_16bit_textures, use_gpu_mipmap;
@@ -543,12 +543,12 @@ typedef struct UserDef {
/* eImageDrawMethod, Method to be used to draw the images (AUTO, GLSL, Textures or DrawPixels) */
short image_draw_method;
-
+
float glalphaclip;
-
+
short autokey_mode; /* eAutokey_Mode, autokeying mode */
short autokey_flag; /* flags for autokeying */
-
+
short text_render, pad9; /* options for text rendering */
struct ColorBand coba_weight; /* from texture.h */
@@ -566,7 +566,7 @@ typedef struct UserDef {
int compute_device_type;
int compute_device_id;
-
+
float fcu_inactive_alpha; /* opacity of inactive F-Curves in F-Curve Editor */
float pixelsize; /* private, set by GHOST, to multiply DPI with */
int virtual_pixel; /* virtual pixelsize mode */
@@ -717,7 +717,7 @@ typedef enum eUserpref_APP_Flag {
typedef enum eAutokey_Mode {
/* AUTOKEY_ON is a bitflag */
AUTOKEY_ON = 1,
-
+
/* 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
@@ -740,7 +740,7 @@ typedef enum eAutokey_Flag {
AUTOKEY_FLAG_INSERTNEEDED = (1 << 1),
AUTOKEY_FLAG_AUTOMATKEY = (1 << 2),
AUTOKEY_FLAG_XYZ2RGB = (1 << 3),
-
+
/* toolsettings->autokey_flag */
AUTOKEY_FLAG_ONLYKEYINGSET = (1 << 6),
AUTOKEY_FLAG_NOWARNING = (1 << 7),
@@ -831,7 +831,7 @@ typedef enum eColorPicker_Types {
* UserDef.timecode_style */
typedef enum eTimecodeStyles {
/* as little info as is necessary to show relevant info
- * with '+' to denote the frames
+ * with '+' to denote the frames
* i.e. HH:MM:SS+FF, MM:SS+FF, SS+FF, or MM:SS
*/
USER_TIMECODE_MINIMAL = 0,
diff --git a/source/blender/makesdna/DNA_vfont_types.h b/source/blender/makesdna/DNA_vfont_types.h
index 7025a5767c4..721a97742b9 100644
--- a/source/blender/makesdna/DNA_vfont_types.h
+++ b/source/blender/makesdna/DNA_vfont_types.h
@@ -44,9 +44,9 @@ struct VFontData;
typedef struct VFont {
ID id;
-
+
char name[1024]; /* 1024 = FILE_MAX */
-
+
struct VFontData *data;
struct PackedFile *packedfile;
diff --git a/source/blender/makesdna/DNA_view2d_types.h b/source/blender/makesdna/DNA_view2d_types.h
index 3319fed8cdd..1ec4bf53ebf 100644
--- a/source/blender/makesdna/DNA_view2d_types.h
+++ b/source/blender/makesdna/DNA_view2d_types.h
@@ -41,23 +41,23 @@ typedef struct View2D {
rctf tot, cur; /* tot - area that data can be drawn in; cur - region of tot that is visible in viewport */
rcti vert, hor; /* vert - vertical scrollbar region; hor - horizontal scrollbar region */
rcti mask; /* mask - region (in screenspace) within which 'cur' can be viewed */
-
+
float min[2], max[2]; /* min/max sizes of 'cur' rect (only when keepzoom not set) */
float minzoom, maxzoom; /* allowable zoom factor range (only when (keepzoom & V2D_LIMITZOOM)) is set */
-
+
short scroll; /* scroll - scrollbars to display (bitflag) */
short scroll_ui; /* scroll_ui - temp settings used for UI drawing of scrollers */
-
+
short keeptot; /* keeptot - 'cur' rect cannot move outside the 'tot' rect? */
short keepzoom; /* keepzoom - axes that zooming cannot occur on, and also clamp within zoom-limits */
short keepofs; /* keepofs - axes that translation is not allowed to occur on */
-
+
short flag; /* settings */
short align; /* alignment of content in totrect */
-
+
short winx, winy; /* storage of current winx/winy values, set in UI_view2d_size_update */
short oldwinx, oldwiny; /* storage of previous winx/winy values encountered by UI_view2d_curRect_validate(), for keepaspect */
-
+
short around; /* pivot point for transforms (rotate and scale) */
float *tab_offset; /* different offset per tab, for buttons */
diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h
index f7e2a98f66b..b90c35e7473 100644
--- a/source/blender/makesdna/DNA_view3d_types.h
+++ b/source/blender/makesdna/DNA_view3d_types.h
@@ -79,7 +79,7 @@ typedef struct BGpic {
/* ********************************* */
typedef struct RegionView3D {
-
+
float winmat[4][4]; /* GL_PROJECTION matrix */
float viewmat[4][4]; /* GL_MODELVIEW matrix */
float viewinv[4][4]; /* inverse of viewmat */
@@ -162,10 +162,10 @@ typedef struct View3D {
unsigned int lay_prev; /* for active layer toggle */
unsigned int lay_used; /* used while drawing */
-
+
short persp DNA_DEPRECATED;
short view DNA_DEPRECATED;
-
+
struct Object *camera, *ob_centre;
rctf render_border;
@@ -173,12 +173,12 @@ typedef struct View3D {
struct BGpic *bgpic DNA_DEPRECATED; /* deprecated, use bgpicbase, only kept for do_versions(...) */
struct View3D *localvd; /* allocated backup of its self while in localview */
-
+
char ob_centre_bone[64]; /* optional string for armature bone to define center, MAXBONENAME */
-
+
unsigned int lay;
int layact;
-
+
/**
* The drawing mode for the 3d display. Set to OB_BOUNDBOX, OB_WIRE, OB_SOLID,
* OB_TEXTURE, OB_MATERIAL or OB_RENDER */
@@ -186,7 +186,7 @@ typedef struct View3D {
short ob_centre_cursor; /* optional bool for 3d cursor to define center */
short scenelock, around;
short flag, flag2;
-
+
float lens, grid;
float near, far;
float ofs[3] DNA_DEPRECATED; /* XXX deprecated */
@@ -200,9 +200,9 @@ typedef struct View3D {
/* transform widget info */
char twtype, twmode, twflag;
-
+
short flag3;
-
+
/* afterdraw, for xray & transparent */
struct ListBase afterdraw_transp;
struct ListBase afterdraw_xray;
diff --git a/source/blender/makesdna/DNA_windowmanager_types.h b/source/blender/makesdna/DNA_windowmanager_types.h
index 7af10a596ff..25a810f5bfd 100644
--- a/source/blender/makesdna/DNA_windowmanager_types.h
+++ b/source/blender/makesdna/DNA_windowmanager_types.h
@@ -233,7 +233,7 @@ typedef struct wmWindow {
#endif
/* These two Lines with # tell makesdna this struct can be excluded. */
-/* should be something like DNA_EXCLUDE
+/* should be something like DNA_EXCLUDE
* but the preprocessor first removes all comments, spaces etc */
#
#
diff --git a/source/blender/makesdna/DNA_world_types.h b/source/blender/makesdna/DNA_world_types.h
index 5fd4c9fd407..c6ef9c19762 100644
--- a/source/blender/makesdna/DNA_world_types.h
+++ b/source/blender/makesdna/DNA_world_types.h
@@ -51,8 +51,8 @@ struct MTex;
* data and modeling data. */
typedef struct World {
ID id;
- struct AnimData *adt; /* animation data (must be immediately after id for utilities to use it) */
-
+ struct AnimData *adt; /* animation data (must be immediately after id for utilities to use it) */
+
short colormodel, totex;
short texact, mistype;
@@ -77,7 +77,7 @@ typedef struct World {
* Radius of the activity bubble, in Manhattan length. Objects
* outside the box are activity-culled. */
float activityBoxRadius; // XXX moved to scene->gamedata in 2.5
-
+
short skytype;
/**
* Some world modes
@@ -86,22 +86,22 @@ typedef struct World {
* bit 2: (reserved) depth of field
* bit 3: (gameengine): Activity culling is enabled.
* bit 4: ambient occlusion
- * bit 5: (gameengine) : enable Bullet DBVT tree for view frustum culling
+ * bit 5: (gameengine) : enable Bullet DBVT tree for view frustum culling
*/
short mode; // partially moved to scene->gamedata in 2.5
short occlusionRes; /* resolution of occlusion Z buffer in pixel */ // XXX moved to scene->gamedata in 2.5
short physicsEngine; /* here it's aligned */ // XXX moved to scene->gamedata in 2.5
short ticrate, maxlogicstep, physubstep, maxphystep; // XXX moved to scene->gamedata in 2.5
-
+
float misi, miststa, mistdist, misthi;
-
+
float starr DNA_DEPRECATED, starg DNA_DEPRECATED, starb DNA_DEPRECATED, stark DNA_DEPRECATED; /* Deprecated */
float starsize DNA_DEPRECATED, starmindist DNA_DEPRECATED;
float stardist DNA_DEPRECATED, starcolnoise DNA_DEPRECATED;
-
+
/* unused now: DOF */
short dofsta, dofend, dofmin, dofmax;
-
+
/* ambient occlusion */
float aodist, aodistfac, aoenergy, aobias;
short aomode, aosamp, aomix, aocolor;
@@ -110,14 +110,14 @@ typedef struct World {
float ao_indirect_energy, ao_env_energy, ao_pad2;
short ao_indirect_bounces, ao_pad;
short ao_samp_method, ao_gather_method, ao_approx_passes;
-
+
/* assorted settings (in the middle of ambient occlusion settings for padding reasons) */
short flag;
-
+
/* ambient occlusion (contd...) */
float *aosphere, *aotables;
-
-
+
+
struct Ipo *ipo DNA_DEPRECATED; /* old animation system, deprecated for 2.5 */
struct MTex *mtex[18]; /* MAX_MTEX */
short pr_texture, use_nodes, pad[2];
@@ -195,7 +195,7 @@ enum {
/* flag */
#define WO_DS_EXPAND (1<<0)
- /* NOTE: this must have the same value as MA_DS_SHOW_TEXS,
+ /* NOTE: this must have the same value as MA_DS_SHOW_TEXS,
* otherwise anim-editors will not read correctly
*/
#define WO_DS_SHOW_TEXS (1<<2)
diff --git a/source/blender/makesdna/intern/dna_genfile.c b/source/blender/makesdna/intern/dna_genfile.c
index 2e21223d042..32e41863ad1 100644
--- a/source/blender/makesdna/intern/dna_genfile.c
+++ b/source/blender/makesdna/intern/dna_genfile.c
@@ -201,10 +201,10 @@ static int elementsize(const SDNA *sdna, short type, short name)
{
int mul, namelen, len;
const char *cp;
-
+
cp = sdna->names[name];
len = 0;
-
+
namelen = strlen(cp);
/* is it a pointer or function pointer? */
if (ispointer(cp)) {
@@ -213,7 +213,7 @@ static int elementsize(const SDNA *sdna, short type, short name)
if (cp[namelen - 1] == ']') {
mul = DNA_elem_array_size(cp);
}
-
+
len = sdna->pointerlen * mul;
}
else if (sdna->typelens[type]) {
@@ -222,11 +222,11 @@ static int elementsize(const SDNA *sdna, short type, short name)
if (cp[namelen - 1] == ']') {
mul = DNA_elem_array_size(cp);
}
-
+
len = mul * sdna->typelens[type];
-
+
}
-
+
return len;
}
@@ -236,13 +236,13 @@ static void printstruct(SDNA *sdna, short strnr)
/* is for debug */
int b, nr;
short *sp;
-
+
sp = sdna->structs[strnr];
-
+
printf("struct %s\n", sdna->types[sp[0]]);
nr = sp[1];
sp += 2;
-
+
for (b = 0; b < nr; b++, sp += 2) {
printf(" %s %s\n", sdna->types[sp[0]], sdna->names[sp[1]]);
}
@@ -322,7 +322,7 @@ static bool init_structDNA(
int *data, *verg, gravity_fix = -1;
short *sp;
char str[8];
-
+
verg = (int *)str;
data = (int *)sdna->data;
@@ -343,17 +343,17 @@ static bool init_structDNA(
const char *cp;
data++;
-
+
/* load names array */
strcpy(str, "NAME");
if (*data == *verg) {
data++;
-
+
sdna->nr_names = *data;
if (do_endian_swap) {
BLI_endian_switch_int32(&sdna->nr_names);
}
-
+
data++;
sdna->names = MEM_callocN(sizeof(void *) * sdna->nr_names, "sdnanames");
}
@@ -361,7 +361,7 @@ static bool init_structDNA(
*r_error_message = "NAME error in SDNA file";
return false;
}
-
+
cp = (char *)data;
for (int nr = 0; nr < sdna->nr_names; nr++) {
sdna->names[nr] = cp;
@@ -381,7 +381,7 @@ static bool init_structDNA(
}
cp = pad_up_4(cp);
-
+
/* load type names array */
data = (int *)cp;
strcpy(str, "TYPE");
@@ -392,7 +392,7 @@ static bool init_structDNA(
if (do_endian_swap) {
BLI_endian_switch_int32(&sdna->nr_types);
}
-
+
data++;
sdna->types = MEM_callocN(sizeof(void *) * sdna->nr_types, "sdnatypes");
}
@@ -400,25 +400,25 @@ static bool init_structDNA(
*r_error_message = "TYPE error in SDNA file";
return false;
}
-
+
cp = (char *)data;
for (int nr = 0; nr < sdna->nr_types; nr++) {
sdna->types[nr] = cp;
-
+
/* this is a patch, to change struct names without a conflict with SDNA */
/* be careful to use it, in this case for a system-struct (opengl/X) */
-
+
if (*cp == 'b') {
/* struct Screen was already used by X, 'bScreen' replaces the old IrisGL 'Screen' struct */
if (strcmp("bScreen", cp) == 0) sdna->types[nr] = cp + 1;
}
-
+
while (*cp) cp++;
cp++;
}
cp = pad_up_4(cp);
-
+
/* load typelen array */
data = (int *)cp;
strcpy(str, "TLEN");
@@ -426,11 +426,11 @@ static bool init_structDNA(
data++;
sp = (short *)data;
sdna->typelens = sp;
-
+
if (do_endian_swap) {
BLI_endian_switch_int16_array(sp, sdna->nr_types);
}
-
+
sp += sdna->nr_types;
}
else {
@@ -444,12 +444,12 @@ static bool init_structDNA(
strcpy(str, "STRC");
if (*data == *verg) {
data++;
-
+
sdna->nr_structs = *data;
if (do_endian_swap) {
BLI_endian_switch_int32(&sdna->nr_structs);
}
-
+
data++;
sdna->structs = MEM_callocN(sizeof(void *) * sdna->nr_structs, "sdnastrcs");
}
@@ -457,17 +457,17 @@ static bool init_structDNA(
*r_error_message = "STRC error in SDNA file";
return false;
}
-
+
sp = (short *)data;
for (int nr = 0; nr < sdna->nr_structs; nr++) {
sdna->structs[nr] = sp;
-
+
if (do_endian_swap) {
short a;
-
+
BLI_endian_switch_int16(&sp[0]);
BLI_endian_switch_int16(&sp[1]);
-
+
a = sp[1];
sp += 2;
while (a--) {
@@ -552,7 +552,7 @@ SDNA *DNA_sdna_from_data(
sdna->data = data;
}
sdna->data_alloc = data_alloc;
-
+
if (init_structDNA(sdna, do_endian_swap, &error_message)) {
return sdna;
@@ -606,11 +606,11 @@ static void recurs_test_compflags(const SDNA *sdna, char *compflags, int structn
int a, b, typenr, elems;
const short *sp;
const char *cp;
-
+
/* check all structs, test if it's inside another struct */
sp = sdna->structs[structnr];
typenr = sp[0];
-
+
for (a = 0; a < sdna->nr_structs; a++) {
if ((a != structnr) && (compflags[a] == SDNA_CMP_EQUAL)) {
sp = sdna->structs[a];
@@ -627,7 +627,7 @@ static void recurs_test_compflags(const SDNA *sdna, char *compflags, int structn
}
}
}
-
+
}
@@ -641,7 +641,7 @@ const char *DNA_struct_get_compareflags(const SDNA *oldsdna, const SDNA *newsdna
const short *sp_old, *sp_new;
const char *str1, *str2;
char *compflags;
-
+
if (oldsdna->nr_structs == 0) {
printf("error: file without SDNA\n");
return NULL;
@@ -649,14 +649,14 @@ const char *DNA_struct_get_compareflags(const SDNA *oldsdna, const SDNA *newsdna
compflags = MEM_callocN(oldsdna->nr_structs, "compflags");
- /* we check all structs in 'oldsdna' and compare them with
+ /* we check all structs in 'oldsdna' and compare them with
* the structs in 'newsdna'
*/
unsigned int newsdna_index_last = 0;
-
+
for (a = 0; a < oldsdna->nr_structs; a++) {
sp_old = oldsdna->structs[a];
-
+
/* search for type in cur */
int sp_new_index = DNA_struct_find_nr_ex(newsdna, oldsdna->types[sp_old[0]], &newsdna_index_last);
@@ -667,7 +667,7 @@ const char *DNA_struct_get_compareflags(const SDNA *oldsdna, const SDNA *newsdna
sp_new = newsdna->structs[sp_new_index];
/* initial assumption */
compflags[a] = SDNA_CMP_NOT_EQUAL;
-
+
/* compare length and amount of elems */
if (sp_new[1] == sp_old[1]) {
if (newsdna->typelens[sp_new[0]] == oldsdna->typelens[sp_old[0]]) {
@@ -701,7 +701,7 @@ const char *DNA_struct_get_compareflags(const SDNA *oldsdna, const SDNA *newsdna
}
}
-
+
}
}
@@ -718,7 +718,7 @@ const char *DNA_struct_get_compareflags(const SDNA *oldsdna, const SDNA *newsdna
recurs_test_compflags(oldsdna, compflags, a);
}
}
-
+
#if 0
for (a = 0; a < oldsdna->nr_structs; a++) {
if (compflags[a] == SDNA_CMP_NOT_EQUAL) {
@@ -801,7 +801,7 @@ static void cast_elem(
case SDNA_TYPE_UINT64:
val = *( (uint64_t *)olddata); break;
}
-
+
switch (ctypenr) {
case SDNA_TYPE_CHAR:
*curdata = val; break;
@@ -846,11 +846,11 @@ static void cast_pointer(int curlen, int oldlen, const char *name, char *curdata
{
int64_t lval;
int arrlen;
-
+
arrlen = DNA_elem_array_size(name);
-
+
while (arrlen > 0) {
-
+
if (curlen == oldlen) {
memcpy(curdata, olddata, curlen);
}
@@ -869,7 +869,7 @@ static void cast_pointer(int curlen, int oldlen, const char *name, char *curdata
/* for debug */
printf("errpr: illegal pointersize!\n");
}
-
+
olddata += oldlen;
curdata += curlen;
arrlen--;
@@ -883,7 +883,7 @@ static void cast_pointer(int curlen, int oldlen, const char *name, char *curdata
static int elem_strcmp(const char *name, const char *oname)
{
int a = 0;
-
+
while (1) {
if (name[a] != oname[a]) return 1;
if (name[a] == '[' || oname[a] == '[') break;
@@ -916,9 +916,9 @@ static const char *find_elem(
{
int a, elemcount, len;
const char *otype, *oname;
-
+
/* without arraypart, so names can differ: return old namenr and type */
-
+
/* in old is the old struct */
elemcount = old[1];
old += 2;
@@ -934,10 +934,10 @@ static const char *find_elem(
if (sppo) *sppo = old;
return olddata;
}
-
+
return NULL;
}
-
+
olddata += len;
}
return NULL;
@@ -975,7 +975,7 @@ static void reconstruct_elem(
*/
int a, elemcount, len, countpos, oldsize, cursize, mul;
const char *otype, *oname, *cp;
-
+
/* is 'name' an array? */
cp = name;
countpos = 0;
@@ -983,7 +983,7 @@ static void reconstruct_elem(
cp++; countpos++;
}
if (*cp != '[') countpos = 0;
-
+
/* in old is the old struct */
elemcount = old[1];
old += 2;
@@ -991,9 +991,9 @@ static void reconstruct_elem(
otype = oldsdna->types[old[0]];
oname = oldsdna->names[old[1]];
len = elementsize(oldsdna, old[0], old[1]);
-
+
if (strcmp(name, oname) == 0) { /* name equal */
-
+
if (ispointer(name)) { /* pointer of functionpointer afhandelen */
cast_pointer(newsdna->pointerlen, oldsdna->pointerlen, name, curdata, olddata);
}
@@ -1009,7 +1009,7 @@ static void reconstruct_elem(
else if (countpos != 0) { /* name is an array */
if (oname[countpos] == '[' && strncmp(name, oname, countpos) == 0) { /* basis equal */
-
+
cursize = DNA_elem_array_size(name);
oldsize = DNA_elem_array_size(oname);
@@ -1022,7 +1022,7 @@ static void reconstruct_elem(
mul = len / oldsize; /* size of single old array element */
mul *= (cursize < oldsize) ? cursize : oldsize; /* smaller of sizes of old and new arrays */
memcpy(curdata, olddata, mul);
-
+
if (oldsize > cursize && strcmp(type, "char") == 0) {
/* string had to be truncated, ensure it's still null-terminated */
curdata[mul - 1] = '\0';
@@ -1086,7 +1086,7 @@ static void reconstruct_struct(
spo = oldsdna->structs[oldSDNAnr];
elen = oldsdna->typelens[spo[0]];
memcpy(cur, data, elen);
-
+
return;
}
@@ -1102,7 +1102,7 @@ static void reconstruct_struct(
for (a = 0; a < elemcount; a++, spc += 2) { /* convert each field */
type = newsdna->types[spc[0]];
name = newsdna->names[spc[1]];
-
+
elen = elementsize(newsdna, spc[0], spc[1]);
/* test: is type a struct? */
@@ -1110,26 +1110,26 @@ static void reconstruct_struct(
/* struct field type */
/* where does the old struct data start (and is there an old one?) */
cpo = (char *)find_elem(oldsdna, type, name, spo, data, &sppo);
-
+
if (cpo) {
oldSDNAnr = DNA_struct_find_nr_ex(oldsdna, type, &oldsdna_index_last);
curSDNAnr = DNA_struct_find_nr_ex(newsdna, type, &cursdna_index_last);
-
+
/* array! */
mul = DNA_elem_array_size(name);
nameo = oldsdna->names[sppo[1]];
mulo = DNA_elem_array_size(nameo);
-
+
eleno = elementsize(oldsdna, sppo[0], sppo[1]);
-
+
elen /= mul;
eleno /= mulo;
-
+
while (mul--) {
reconstruct_struct(newsdna, oldsdna, compflags, oldSDNAnr, cpo, curSDNAnr, cpc);
cpo += eleno;
cpc += elen;
-
+
/* new struct array larger than old */
mulo--;
if (mulo <= 0) break;
@@ -1167,18 +1167,18 @@ void DNA_struct_switch_endian(const SDNA *oldsdna, int oldSDNAnr, char *data)
if (oldSDNAnr == -1) return;
firststructtypenr = *(oldsdna->structs[0]);
-
+
spo = spc = oldsdna->structs[oldSDNAnr];
elemcount = spo[1];
spc += 2;
cur = data;
-
+
for (a = 0; a < elemcount; a++, spc += 2) {
type = oldsdna->types[spc[0]];
name = oldsdna->names[spc[1]];
-
+
/* elementsize = including arraysize */
elen = elementsize(oldsdna, spc[0], spc[1]);
@@ -1189,7 +1189,7 @@ void DNA_struct_switch_endian(const SDNA *oldsdna, int oldSDNAnr, char *data)
char *cpo = (char *)find_elem(oldsdna, type, name, spo, data, NULL);
if (cpo) {
oldSDNAnr = DNA_struct_find_nr_ex(oldsdna, type, &oldsdna_index_last);
-
+
mul = DNA_elem_array_size(name);
elena = elen / mul;
@@ -1255,7 +1255,7 @@ void *DNA_struct_reconstruct(
char *cur, *cpc;
const char *cpo;
const char *type;
-
+
/* oldSDNAnr == structnr, we're looking for the corresponding 'cur' number */
spo = oldsdna->structs[oldSDNAnr];
type = oldsdna->types[spo[0]];
@@ -1304,11 +1304,11 @@ bool DNA_struct_find(const SDNA *sdna, const char *stype)
bool DNA_struct_elem_find(const SDNA *sdna, const char *stype, const char *vartype, const char *name)
{
const int SDNAnr = DNA_struct_find_nr(sdna, stype);
-
+
if (SDNAnr != -1) {
const short * const spo = sdna->structs[SDNAnr];
const char * const cp = find_elem(sdna, vartype, name, spo, NULL, NULL);
-
+
if (cp) {
return true;
}
diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c
index f249eb92886..3b8d0e01ace 100644
--- a/source/blender/makesdna/intern/makesdna.c
+++ b/source/blender/makesdna/intern/makesdna.c
@@ -226,7 +226,7 @@ static int add_type(const char *str, int len)
{
int nr;
char *cp;
-
+
/* first do validity check */
if (str[0] == 0) {
return -1;
@@ -236,7 +236,7 @@ static int add_type(const char *str, int len)
* 'struct SomeStruct* somevar;' <-- correct but we cant handle right now. */
return -1;
}
-
+
/* search through type array */
for (nr = 0; nr < nr_types; nr++) {
if (strcmp(str, types[nr]) == 0) {
@@ -248,7 +248,7 @@ static int add_type(const char *str, int len)
return nr;
}
}
-
+
/* append new type */
if (nr_types == 0) {
cp = typedata;
@@ -261,13 +261,13 @@ static int add_type(const char *str, int len)
typelens_native[nr_types] = len;
typelens_32[nr_types] = len;
typelens_64[nr_types] = len;
-
+
if (nr_types >= maxnr) {
printf("too many types\n");
return nr_types - 1;
}
nr_types++;
-
+
return nr_types - 1;
}
@@ -288,7 +288,7 @@ static int add_name(const char *str)
const char *name;
additional_slen_offset = 0;
-
+
if (str[0] == 0 /* || (str[1] == 0) */) return -1;
if (str[0] == '(' && str[1] == '*') {
@@ -306,7 +306,7 @@ static int add_name(const char *str)
buf[i] = str[i];
i++;
}
-
+
/* Another number we need is the extra slen offset. This extra
* offset is the overshoot after a space. If there is no
* space, no overshoot should be calculated. */
@@ -322,7 +322,7 @@ static int add_name(const char *str)
if (debugSDNA > 3) printf("seen %c ( %d)\n"
"special after offset%d\n",
str[j], str[j], j);
-
+
if (!isfuncptr) {
/* multidimensional array pointer case */
if (str[j] == 0) {
@@ -332,7 +332,7 @@ static int add_name(const char *str)
printf("Error during tokening multidim array pointer\n");
}
else if (str[j] == 0) {
- if (debugSDNA > 3) printf("offsetting for space\n");
+ if (debugSDNA > 3) printf("offsetting for space\n");
/* get additional offset */
k = 0;
while (str[j] != ')') {
@@ -349,7 +349,7 @@ static int add_name(const char *str)
else {
printf("Error during tokening function pointer argument list\n");
}
-
+
/*
* Put )(void) at the end? Maybe )(). Should check this with
* old sdna. Actually, sometimes )(), sometimes )(void...)
@@ -363,7 +363,7 @@ static int add_name(const char *str)
*
* */
buf[i] = 0;
- if (debugSDNA > 3) printf("Name before chomping: %s\n", buf);
+ if (debugSDNA > 3) printf("Name before chomping: %s\n", buf);
if ((strncmp(buf, "(*headdraw", 10) == 0) ||
(strncmp(buf, "(*windraw", 9) == 0) )
{
@@ -390,14 +390,14 @@ static int add_name(const char *str)
/* normal field: old code */
name = str;
}
-
+
/* search name array */
for (nr = 0; nr < nr_names; nr++) {
if (strcmp(name, names[nr]) == 0) {
return nr;
}
}
-
+
/* append new type */
if (nr_names == 0) {
cp = namedata;
@@ -407,13 +407,13 @@ static int add_name(const char *str)
}
strcpy(cp, name);
names[nr_names] = cp;
-
+
if (nr_names >= maxnr) {
printf("too many names\n");
return nr_names - 1;
}
nr_names++;
-
+
return nr_names - 1;
}
@@ -430,16 +430,16 @@ static short *add_struct(int namecode)
len = sp[1];
structs[nr_structs] = sp + 2 * len + 2;
}
-
+
sp = structs[nr_structs];
sp[0] = namecode;
-
+
if (nr_structs >= maxnr) {
printf("too many structs\n");
return sp;
}
nr_structs++;
-
+
return sp;
}
@@ -447,14 +447,14 @@ static int preprocess_include(char *maindata, int len)
{
int a, newlen, comment = 0;
char *cp, *temp, *md;
-
+
/* note: len + 1, last character is a dummy to prevent
* comparisons using uninitialized memory */
temp = MEM_mallocN(len + 1, "preprocess_include");
temp[len] = ' ';
memcpy(temp, maindata, len);
-
+
/* remove all c++ comments */
/* replace all enters/tabs/etc with spaces */
cp = temp;
@@ -470,7 +470,7 @@ static int preprocess_include(char *maindata, int len)
if (comment || *cp < 32 || *cp > 128) *cp = 32;
cp++;
}
-
+
/* data from temp copy to maindata, remove comments and double spaces */
cp = temp;
@@ -479,7 +479,7 @@ static int preprocess_include(char *maindata, int len)
comment = 0;
a = len;
while (a--) {
-
+
if (cp[0] == '/' && cp[1] == '*') {
comment = 1;
cp[0] = cp[1] = 32;
@@ -511,7 +511,7 @@ static int preprocess_include(char *maindata, int len)
}
cp++;
}
-
+
MEM_freeN(temp);
return newlen;
}
@@ -552,7 +552,7 @@ static void *read_file_data(const char *filename, int *r_len)
fclose(fp);
return NULL;
}
-
+
fclose(fp);
return data;
}
@@ -566,7 +566,7 @@ static int convert_include(const char *filename)
short *structpoin, *sp;
char *maindata, *mainend, *md, *md1;
bool skip_struct;
-
+
md = maindata = read_file_data(filename, &filelen);
if (filelen == -1) {
fprintf(stderr, "Can't read file %s\n", filename);
@@ -580,12 +580,12 @@ static int convert_include(const char *filename)
count = 0;
skip_struct = false;
while (count < filelen) {
-
+
/* code for skipping a struct: two hashes on 2 lines. (preprocess added a space) */
if (md[0] == '#' && md[1] == ' ' && md[2] == '#') {
skip_struct = true;
}
-
+
if (md[0] == '{') {
md[0] = 0;
if (skip_struct) {
@@ -596,7 +596,7 @@ static int convert_include(const char *filename)
md1 = md - 2;
while (*md1 != 32) md1--; /* to beginning of word */
md1++;
-
+
/* we've got a struct name when... */
if (strncmp(md1 - 7, "struct", 6) == 0) {
@@ -615,22 +615,22 @@ static int convert_include(const char *filename)
md1 = md + 1;
while (*md1 != '}') {
if (md1 > mainend) break;
-
+
if (*md1 == ',' || *md1 == ' ') *md1 = 0;
md1++;
}
-
+
/* read types and names until first character that is not '}' */
md1 = md + 1;
while (*md1 != '}') {
if (md1 > mainend) break;
-
+
/* skip when it says 'struct' or 'unsigned' or 'const' */
if (*md1) {
if (strncmp(md1, "struct", 6) == 0) md1 += 7;
if (strncmp(md1, "unsigned", 8) == 0) md1 += 9;
if (strncmp(md1, "const", 5) == 0) md1 += 6;
-
+
/* we've got a type! */
type = add_type(md1, 0);
if (type == -1) {
@@ -642,11 +642,11 @@ static int convert_include(const char *filename)
md1 += strlen(md1);
-
+
/* read until ';' */
while (*md1 != ';') {
if (md1 > mainend) break;
-
+
if (*md1) {
/* We've got a name. slen needs
* correction for function
@@ -665,11 +665,11 @@ static int convert_include(const char *filename)
structpoin[1]++;
sp += 2;
-
+
md1 += slen;
break;
}
-
+
name = add_name(md1);
slen += additional_slen_offset;
@@ -680,7 +680,7 @@ static int convert_include(const char *filename)
structpoin[1]++;
sp += 2;
-
+
md1 += slen;
}
md1++;
@@ -697,7 +697,7 @@ static int convert_include(const char *filename)
count++;
md++;
}
-
+
MEM_freeN(maindata);
return 0;
@@ -707,7 +707,7 @@ static int arraysize(const char *str)
{
int a, mul = 1;
const char *cp = NULL;
-
+
for (a = 0; str[a]; a++) {
if (str[a] == '[') {
cp = &(str[a + 1]);
@@ -718,7 +718,7 @@ static int arraysize(const char *str)
mul *= atoi(cp);
}
}
-
+
return mul;
}
@@ -752,7 +752,7 @@ static int calculate_structlens(int firststruct)
while (unknown) {
lastunknown = unknown;
unknown = 0;
-
+
/* check all structs... */
for (int a = 0; a < nr_structs; a++) {
const short *structpoin = structs[a];
@@ -760,13 +760,13 @@ static int calculate_structlens(int firststruct)
/* when length is not known... */
if (typelens_native[structtype] == 0) {
-
+
const short *sp = structpoin + 2;
int len_native = 0;
int len_32 = 0;
int len_64 = 0;
bool has_pointer = false;
-
+
/* check all elements in struct */
for (int b = 0; b < structpoin[1]; b++, sp += 2) {
int type = sp[0];
@@ -838,7 +838,7 @@ static int calculate_structlens(int firststruct)
dna_error = 1;
}
}
-
+
/* Check 2-4-8 aligned. */
if (!check_field_alignment(firststruct, structtype, type, len_32, cp, "32 bit")) {
dna_error = 1;
@@ -850,7 +850,7 @@ static int calculate_structlens(int firststruct)
len_native += mul * typelens_native[type];
len_32 += mul * typelens_32[type];
len_64 += mul * typelens_64[type];
-
+
}
else {
len_native = 0;
@@ -859,7 +859,7 @@ static int calculate_structlens(int firststruct)
break;
}
}
-
+
if (len_native == 0) {
unknown++;
}
@@ -876,30 +876,30 @@ static int calculate_structlens(int firststruct)
dna_error = 1;
}
}
-
+
if (len_native % 4) {
fprintf(stderr, "Sizeerror 4 in struct: %s (add %d bytes)\n",
types[structtype], len_native % 4);
dna_error = 1;
}
-
+
}
}
}
-
+
if (unknown == lastunknown) break;
}
-
+
if (unknown) {
fprintf(stderr, "ERROR: still %d structs unknown\n", unknown);
if (debugSDNA) {
fprintf(stderr, "*** Known structs :\n");
-
+
for (int a = 0; a < nr_structs; a++) {
const short *structpoin = structs[a];
const int structtype = structpoin[0];
-
+
/* length unknown */
if (typelens_native[structtype] != 0) {
fprintf(stderr, " %s\n", types[structtype]);
@@ -907,9 +907,9 @@ static int calculate_structlens(int firststruct)
}
}
-
+
fprintf(stderr, "*** Unknown structs :\n");
-
+
for (int a = 0; a < nr_structs; a++) {
const short *structpoin = structs[a];
const int structtype = structpoin[0];
@@ -935,7 +935,7 @@ static void dna_write(FILE *file, const void *pntr, const int size)
const char *data;
data = (const char *)pntr;
-
+
for (i = 0; i < size; i++) {
fprintf(file, "%d, ", data[i]);
linelength++;
@@ -956,7 +956,7 @@ void printStructLengths(void)
while (unknown) {
/*lastunknown = unknown;*/ /*UNUSED*/
unknown = 0;
-
+
/* check all structs... */
for (a = 0; a < nr_structs; a++) {
structpoin = structs[a];
@@ -978,17 +978,17 @@ static int make_structDNA(const char *baseDirectory, FILE *file, FILE *file_offs
/* it a bit. Hope this is enough :) -nzc- */
char str[SDNA_MAX_FILENAME_LENGTH], *cp;
int firststruct;
-
+
if (debugSDNA > 0) {
fflush(stdout);
printf("Running makesdna at debug level %d\n", debugSDNA);
}
-
+
/* the longest known struct is 50k, so we assume 100k is sufficent! */
namedata = MEM_callocN(maxdata, "namedata");
typedata = MEM_callocN(maxdata, "typedata");
structdata = MEM_callocN(maxdata, "structdata");
-
+
/* a maximum of 5000 variables, must be sufficient? */
names = MEM_callocN(sizeof(char *) * maxnr, "names");
types = MEM_callocN(sizeof(char *) * maxnr, "types");
@@ -1023,12 +1023,12 @@ static int make_structDNA(const char *baseDirectory, FILE *file, FILE *file_offs
/* the defines above shouldn't be output in the padding file... */
firststruct = nr_types;
-
+
/* add all include files defined in the global array */
/* Since the internal file+path name buffer has limited length, I do a */
/* little test first... */
/* Mind the breaking condition here! */
- if (debugSDNA) printf("\tStart of header scan:\n");
+ if (debugSDNA) printf("\tStart of header scan:\n");
for (i = 0; *(includefiles[i]) != '\0'; i++) {
sprintf(str, "%s%s", baseDirectory, includefiles[i]);
if (debugSDNA) printf("\t|-- Converting %s\n", str);
@@ -1036,7 +1036,7 @@ static int make_structDNA(const char *baseDirectory, FILE *file, FILE *file_offs
return (1);
}
}
- if (debugSDNA) printf("\tFinished scanning %d headers.\n", i);
+ if (debugSDNA) printf("\tFinished scanning %d headers.\n", i);
if (calculate_structlens(firststruct)) {
/* error */
@@ -1054,13 +1054,13 @@ static int make_structDNA(const char *baseDirectory, FILE *file, FILE *file_offs
printf(" %s\n", names[a]);
}
printf("\n");
-
+
sp = typelens_native;
for (a = 0; a < nr_types; a++, sp++) {
printf(" %s %d\n", types[a], *sp);
}
printf("\n");
-
+
for (a = 0; a < nr_structs; a++) {
sp = structs[a];
printf(" struct %s elems: %d size: %d\n", types[sp[0]], sp[1], typelens_native[sp[0]]);
@@ -1076,63 +1076,63 @@ static int make_structDNA(const char *baseDirectory, FILE *file, FILE *file_offs
/* file writing */
if (debugSDNA > 0) printf("Writing file ... ");
-
+
if (nr_names == 0 || nr_structs == 0) {
/* pass */
}
else {
dna_write(file, "SDNA", 4);
-
+
/* write names */
dna_write(file, "NAME", 4);
len = nr_names;
dna_write(file, &len, 4);
-
+
/* calculate size of datablock with strings */
cp = names[nr_names - 1];
cp += strlen(names[nr_names - 1]) + 1; /* +1: null-terminator */
len = (intptr_t) (cp - (char *) names[0]);
len = (len + 3) & ~3;
dna_write(file, names[0], len);
-
+
/* write TYPES */
dna_write(file, "TYPE", 4);
len = nr_types;
dna_write(file, &len, 4);
-
+
/* calculate datablock size */
cp = types[nr_types - 1];
cp += strlen(types[nr_types - 1]) + 1; /* +1: null-terminator */
len = (intptr_t) (cp - (char *) types[0]);
len = (len + 3) & ~3;
-
+
dna_write(file, types[0], len);
-
+
/* WRITE TYPELENGTHS */
dna_write(file, "TLEN", 4);
-
+
len = 2 * nr_types;
if (nr_types & 1) len += 2;
dna_write(file, typelens_native, len);
-
+
/* WRITE STRUCTS */
dna_write(file, "STRC", 4);
len = nr_structs;
dna_write(file, &len, 4);
-
+
/* calc datablock size */
sp = structs[nr_structs - 1];
sp += 2 + 2 * (sp[1]);
len = (intptr_t) ((char *) sp - (char *) structs[0]);
len = (len + 3) & ~3;
-
+
dna_write(file, structs[0], len);
-
+
/* a simple dna padding test */
if (0) {
FILE *fp;
int a;
-
+
fp = fopen("padding.c", "w");
if (fp == NULL) {
/* pass */
@@ -1160,7 +1160,7 @@ static int make_structDNA(const char *baseDirectory, FILE *file, FILE *file_offs
}
/* end end padding test */
}
-
+
/* write a simple enum with all structs offsets,
* should only be accessed via SDNA_TYPE_FROM_STRUCT macro */
{
@@ -1174,7 +1174,7 @@ static int make_structDNA(const char *baseDirectory, FILE *file, FILE *file_offs
fprintf(file_offsets, "\tSDNA_TYPE_MAX = %d,\n", nr_structs);
fprintf(file_offsets, "};\n");
}
-
+
MEM_freeN(namedata);
MEM_freeN(typedata);
MEM_freeN(structdata);
@@ -1186,7 +1186,7 @@ static int make_structDNA(const char *baseDirectory, FILE *file, FILE *file_offs
MEM_freeN(structs);
if (debugSDNA > 0) printf("done.\n");
-
+
return(0);
}
@@ -1254,7 +1254,7 @@ int main(int argc, char **argv)
}
}
-
+
return(return_status);
}
@@ -1297,14 +1297,14 @@ int main(int argc, char **argv)
#include "DNA_mesh_types.h"
#include "DNA_meshdata_types.h"
#include "DNA_modifier_types.h"
-#include "DNA_lattice_types.h"
+#include "DNA_lattice_types.h"
#include "DNA_object_types.h"
#include "DNA_object_force_types.h"
#include "DNA_object_fluidsim_types.h"
#include "DNA_world_types.h"
#include "DNA_scene_types.h"
#include "DNA_view3d_types.h"
-#include "DNA_view2d_types.h"
+#include "DNA_view2d_types.h"
#include "DNA_space_types.h"
#include "DNA_userdef_types.h"
#include "DNA_screen_types.h"