From 1e9bf0cfdb6c925b28af6f0330467e7d9d798c05 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 22 Mar 2010 09:30:00 +0000 Subject: spaces -> tabs, (4 spaces == 1 tab, only for white space preceding text) --- source/blender/makesdna/DNA_ID.h | 4 ++-- source/blender/makesdna/DNA_action_types.h | 4 ++-- source/blender/makesdna/DNA_camera_types.h | 2 +- source/blender/makesdna/DNA_cloth_types.h | 2 +- source/blender/makesdna/DNA_constraint_types.h | 2 +- source/blender/makesdna/DNA_lamp_types.h | 18 +++++++++--------- source/blender/makesdna/DNA_modifier_types.h | 20 ++++++++++---------- source/blender/makesdna/DNA_object_force.h | 8 ++++---- source/blender/makesdna/DNA_object_types.h | 2 +- source/blender/makesdna/DNA_scene_types.h | 6 +++--- source/blender/makesdna/DNA_sdna_types.h | 2 +- source/blender/makesdna/DNA_sensor_types.h | 14 +++++++------- source/blender/makesdna/DNA_sequence_types.h | 2 +- source/blender/makesdna/DNA_space_types.h | 2 +- source/blender/makesdna/DNA_texture_types.h | 2 +- source/blender/makesdna/DNA_vec_types.h | 8 ++++---- source/blender/makesdna/DNA_view3d_types.h | 12 ++++++------ source/blender/makesdna/intern/makesdna.c | 6 +++--- 18 files changed, 58 insertions(+), 58 deletions(-) (limited to 'source/blender/makesdna') diff --git a/source/blender/makesdna/DNA_ID.h b/source/blender/makesdna/DNA_ID.h index 24e1a9f24e9..e9b1b655ad8 100644 --- a/source/blender/makesdna/DNA_ID.h +++ b/source/blender/makesdna/DNA_ID.h @@ -58,11 +58,11 @@ typedef struct IDProperty { seemed like a good idea as a pad var was needed anyway :)*/ IDPropertyData data; /* note, alignment for 64 bits */ int len; /* array length, also (this is important!) string length + 1. - the idea is to be able to reuse array realloc functions on strings.*/ + the idea is to be able to reuse array realloc functions on strings.*/ /*totallen is total length of allocated array/string, including a buffer. Note that the buffering is mild; the code comes from python's list implementation.*/ int totallen; /*strings and arrays are both buffered, though the buffer isn't - saved.*/ + saved.*/ } IDProperty; #define MAX_IDPROP_NAME 32 diff --git a/source/blender/makesdna/DNA_action_types.h b/source/blender/makesdna/DNA_action_types.h index 27d47ea5a42..937dd3ee324 100644 --- a/source/blender/makesdna/DNA_action_types.h +++ b/source/blender/makesdna/DNA_action_types.h @@ -357,9 +357,9 @@ typedef enum ePose_Flags { POSE_CONSTRAINTS_TIMEDEPEND = (1<<3), /* recalculate bone paths */ POSE_RECALCPATHS = (1<<4), - /* set by armature_rebuild_pose to give a chance to the IK solver to rebuild IK tree */ + /* set by armature_rebuild_pose to give a chance to the IK solver to rebuild IK tree */ POSE_WAS_REBUILT = (1<<5), - /* set by game_copy_pose to indicate that this pose is used in the game engine */ + /* set by game_copy_pose to indicate that this pose is used in the game engine */ POSE_GAME_ENGINE = (1<<6), } ePose_Flags; diff --git a/source/blender/makesdna/DNA_camera_types.h b/source/blender/makesdna/DNA_camera_types.h index dc075af353c..a15f9a4eb4c 100644 --- a/source/blender/makesdna/DNA_camera_types.h +++ b/source/blender/makesdna/DNA_camera_types.h @@ -53,7 +53,7 @@ typedef struct Camera { /* yafray: dof params */ /* qdn: yafray var 'YF_dofdist' now enabled for defocus composit node as well. - The name was not changed so that no other files need to be modified */ + The name was not changed so that no other files need to be modified */ float YF_dofdist, YF_aperture; short YF_bkhtype, YF_bkhbias; float YF_bkhrot; diff --git a/source/blender/makesdna/DNA_cloth_types.h b/source/blender/makesdna/DNA_cloth_types.h index 8e04107afe0..8fa63e6acc4 100644 --- a/source/blender/makesdna/DNA_cloth_types.h +++ b/source/blender/makesdna/DNA_cloth_types.h @@ -77,7 +77,7 @@ typedef struct ClothSimSettings short vgroup_mass; /* optional vertexgroup name for assigning weight.*/ short vgroup_struct; /* vertex group for scaling structural stiffness */ short presets; /* used for presets on GUI */ - short reset; + short reset; struct EffectorWeights *effector_weights; } ClothSimSettings; diff --git a/source/blender/makesdna/DNA_constraint_types.h b/source/blender/makesdna/DNA_constraint_types.h index 358cbb6e34c..6c7bda171eb 100644 --- a/source/blender/makesdna/DNA_constraint_types.h +++ b/source/blender/makesdna/DNA_constraint_types.h @@ -454,7 +454,7 @@ typedef enum eBConstraint_SpaceTypes { CONSTRAINT_SPACE_LOCAL, /* = 1 */ /* for posechannels - pose space */ CONSTRAINT_SPACE_POSE, /* = 2 */ - /* for posechannels - local with parent */ + /* for posechannels - local with parent */ CONSTRAINT_SPACE_PARLOCAL, /* = 3 */ /* for files from between 2.43-2.46 (should have been parlocal) */ CONSTRAINT_SPACE_INVALID, /* = 4. do not exchange for anything! */ diff --git a/source/blender/makesdna/DNA_lamp_types.h b/source/blender/makesdna/DNA_lamp_types.h index cb458708b3e..1cf6b25c58f 100644 --- a/source/blender/makesdna/DNA_lamp_types.h +++ b/source/blender/makesdna/DNA_lamp_types.h @@ -81,16 +81,16 @@ typedef struct Lamp { /* sun/sky */ short sun_effect_type; short skyblendtype; - float horizon_brightness; - float spread; - float sun_brightness; - float sun_size; - float backscattered_light; - float sun_intensity; + float horizon_brightness; + float spread; + float sun_brightness; + float sun_size; + float backscattered_light; + float sun_intensity; float atm_turbidity; - float atm_inscattering_factor; - float atm_extinction_factor; - float atm_distance_factor; + float atm_inscattering_factor; + float atm_extinction_factor; + float atm_distance_factor; float skyblendfac; float sky_exposure; short sky_colorspace, pad4; diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h index dbcf5849616..44c1bdff876 100644 --- a/source/blender/makesdna/DNA_modifier_types.h +++ b/source/blender/makesdna/DNA_modifier_types.h @@ -168,31 +168,31 @@ typedef struct ArrayModifierData { struct Object *offset_ob; /* a constant duplicate offset; 1 means the duplicates are 1 unit apart - */ + */ float offset[3]; /* a scaled factor for duplicate offsets; 1 means the duplicates are 1 object-width apart - */ + */ float scale[3]; /* the length over which to distribute the duplicates */ float length; /* the limit below which to merge vertices in adjacent duplicates */ float merge_dist; /* determines how duplicate count is calculated; one of: - MOD_ARR_FIXEDCOUNT -> fixed - MOD_ARR_FITLENGTH -> calculated to fit a set length - MOD_ARR_FITCURVE -> calculated to fit the length of a Curve object - */ + MOD_ARR_FIXEDCOUNT -> fixed + MOD_ARR_FITLENGTH -> calculated to fit a set length + MOD_ARR_FITCURVE -> calculated to fit the length of a Curve object + */ int fit_type; /* flags specifying how total offset is calculated; binary OR of: - MOD_ARR_OFF_CONST -> total offset += offset - MOD_ARR_OFF_RELATIVE -> total offset += relative * object width - MOD_ARR_OFF_OBJ -> total offset += offset_ob's matrix + MOD_ARR_OFF_CONST -> total offset += offset + MOD_ARR_OFF_RELATIVE -> total offset += relative * object width + MOD_ARR_OFF_OBJ -> total offset += offset_ob's matrix total offset is the sum of the individual enabled offsets */ int offset_type; /* general flags: - MOD_ARR_MERGE -> merge vertices in adjacent duplicates + MOD_ARR_MERGE -> merge vertices in adjacent duplicates */ int flags; /* the number of duplicates to generate for MOD_ARR_FIXEDCOUNT */ diff --git a/source/blender/makesdna/DNA_object_force.h b/source/blender/makesdna/DNA_object_force.h index 1df76a39d9d..29a188c0f92 100644 --- a/source/blender/makesdna/DNA_object_force.h +++ b/source/blender/makesdna/DNA_object_force.h @@ -266,7 +266,7 @@ typedef struct SoftBody { /* springs */ float inspring; /* softbody inner springs */ float infrict; /* softbody inner springs friction */ - char namedVG_Spring_K[32]; /* along with it introduce Spring_K painting + char namedVG_Spring_K[32]; /* along with it introduce Spring_K painting starting to fix old bug .. nastyness that VG are indexes rather find them by name tag to find it -> jow20090613 */ @@ -286,7 +286,7 @@ typedef struct SoftBody { float balldamp; /* cooling down collision response */ float ballstiff; /* pressure the ball is loaded with */ short sbc_mode; - short aeroedge, + short aeroedge, minloops, maxloops, choke, @@ -302,11 +302,11 @@ typedef struct SoftBody { struct ListBase ptcaches; 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]; - char pad4[4]; + char pad4[4]; } SoftBody; diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index c4d4363db81..b572c50a4ae 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -169,7 +169,7 @@ typedef struct Object { float mass, damping, inertia; /* The form factor k is introduced to give the user more control * and to fix incompatibility problems. - * For rotational symmetric objects, the inertia value can be + * For rotational symmetric objects, the inertia value can be * expressed as: Theta = k * m * r^2 * where m = Mass, r = Radius * For a Sphere, the form factor is by default = 0.4 diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index a5273e06afb..bd5c2e1c325 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -219,7 +219,7 @@ typedef struct RenderData { short dimensionspreset; /* for the dimensions presets menu */ - short filtertype; /* filter is box, tent, gauss, mitch, etc */ + short filtertype; /* filter is box, tent, gauss, mitch, etc */ short size, maximsize; /* size in %, max in Kb */ /* from buttons: */ @@ -245,7 +245,7 @@ typedef struct RenderData { /** Mode bits: */ /* 0: Enable backbuffering for images */ short bufflag; - short quality; + short quality; /** * Render to image editor, fullscreen or to new window. @@ -328,7 +328,7 @@ typedef struct RenderData { /** post-production settings. Depricated, but here for upwards compat (initialized to 1) */ float postgamma, posthue, postsat; - /* Dither noise intensity */ + /* Dither noise intensity */ float dither_intensity; /* Bake Render options */ diff --git a/source/blender/makesdna/DNA_sdna_types.h b/source/blender/makesdna/DNA_sdna_types.h index d13edb99f07..9b486e2851d 100644 --- a/source/blender/makesdna/DNA_sdna_types.h +++ b/source/blender/makesdna/DNA_sdna_types.h @@ -48,7 +48,7 @@ typedef struct SDNA { int nr_structs; /* number of struct types */ short **structs; /* sp= structs[a] is the adress of a struct definintion - sp[0] is struct type number, sp[1] amount of members + sp[0] is struct type number, sp[1] amount of members (sp[2], sp[3]), (sp[4], sp[5]), .. are the member type and name numbers respectively */ diff --git a/source/blender/makesdna/DNA_sensor_types.h b/source/blender/makesdna/DNA_sensor_types.h index 41476c81c85..3bbcb128f07 100644 --- a/source/blender/makesdna/DNA_sensor_types.h +++ b/source/blender/makesdna/DNA_sensor_types.h @@ -75,21 +75,21 @@ typedef struct bKeyboardSensor { } bKeyboardSensor; typedef struct bPropertySensor { - int type; - int pad; + int type; + int pad; char name[32]; char value[32]; - char maxvalue[32]; + char maxvalue[32]; } bPropertySensor; typedef struct bActuatorSensor { - int type; - int pad; + int type; + int pad; char name[32]; } bActuatorSensor; typedef struct bDelaySensor { - short delay; + short delay; short duration; short flag; short pad; @@ -101,7 +101,7 @@ typedef struct bCollisionSensor { // struct Material *ma; // XXX remove materialName short damptimer, damp; short mode; /* flag to choose material or property */ - short pad2; + short pad2; } bCollisionSensor; typedef struct bRadarSensor { diff --git a/source/blender/makesdna/DNA_sequence_types.h b/source/blender/makesdna/DNA_sequence_types.h index 1a73588d6eb..2fd83742367 100644 --- a/source/blender/makesdna/DNA_sequence_types.h +++ b/source/blender/makesdna/DNA_sequence_types.h @@ -207,7 +207,7 @@ typedef struct GlowVars { float fMini; /* Minimum intensity to trigger a glow */ float fClamp; float fBoost; /* Amount to multiply glow intensity */ - float dDist; /* Radius of glow blurring */ + float dDist; /* Radius of glow blurring */ int dQuality; int bNoComp; /* SHOW/HIDE glow buffer */ } GlowVars; diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h index 0ea64765198..a643e08bbfc 100644 --- a/source/blender/makesdna/DNA_space_types.h +++ b/source/blender/makesdna/DNA_space_types.h @@ -769,7 +769,7 @@ enum { #define ST_SCROLL_SELECT 0x0001 // scrollable #define ST_CLEAR_NAMESPACE 0x0010 // clear namespace after script - // execution (see BPY_main.c) + // execution (see BPY_main.c) #define ST_FIND_WRAP 0x0020 #define ST_FIND_ALL 0x0040 diff --git a/source/blender/makesdna/DNA_texture_types.h b/source/blender/makesdna/DNA_texture_types.h index 5d80936d2cc..2c5c50d7dc2 100644 --- a/source/blender/makesdna/DNA_texture_types.h +++ b/source/blender/makesdna/DNA_texture_types.h @@ -170,7 +170,7 @@ typedef struct PointDensity { short noise_depth; short noise_influence; short noise_basis; - short pdpad3[3]; + short pdpad3[3]; float noise_fac; float speed_scale; diff --git a/source/blender/makesdna/DNA_vec_types.h b/source/blender/makesdna/DNA_vec_types.h index 4a6f7f3a3cc..5d6f1039ed5 100644 --- a/source/blender/makesdna/DNA_vec_types.h +++ b/source/blender/makesdna/DNA_vec_types.h @@ -78,13 +78,13 @@ typedef struct vec4d { #endif typedef struct rcti { - int xmin, xmax; - int ymin, ymax; + int xmin, xmax; + int ymin, ymax; } rcti; typedef struct rctf { - float xmin, xmax; - float ymin, ymax; + float xmin, xmax; + float ymin, ymax; } rctf; #endif diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h index 60aba105ff4..c5516a3bff5 100644 --- a/source/blender/makesdna/DNA_view3d_types.h +++ b/source/blender/makesdna/DNA_view3d_types.h @@ -63,14 +63,14 @@ struct wmTimer; /* Background Picture in 3D-View */ typedef struct BGpic { - struct BGpic *next, *prev; + struct BGpic *next, *prev; - struct Image *ima; + struct Image *ima; struct ImageUser iuser; - float xof, yof, size, blend; - short view; - short flag; - float pad2; + float xof, yof, size, blend; + short view; + short flag; + float pad2; } BGpic; /* ********************************* */ diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c index 2d62b81e81b..adcb074461e 100644 --- a/source/blender/makesdna/intern/makesdna.c +++ b/source/blender/makesdna/intern/makesdna.c @@ -335,8 +335,8 @@ int add_name(char *str) /* * Put )(void) at the end? Maybe )(). Should check this with - * old sdna. Actually, sometimes )(), sometimes )(void...) - * Alas.. such is the nature of braindamage :( + * old sdna. Actually, sometimes )(), sometimes )(void...) + * Alas.. such is the nature of braindamage :( * * Sorted it out: always do )(), except for headdraw and * windraw, part of ScrArea. This is important, because some @@ -920,7 +920,7 @@ int make_structDNA(char *baseDirectory, FILE *file) if (debugSDNA) printf("\tStart of header scan:\n"); for (i = 0; strlen(includefiles[i]); i++) { sprintf(str, "%s%s", baseDirectory, includefiles[i]); - if (debugSDNA) printf("\t|-- Converting %s\n", str); + if (debugSDNA) printf("\t|-- Converting %s\n", str); if (convert_include(str)) { return (1); } -- cgit v1.2.3