diff options
Diffstat (limited to 'source/blender/makesdna')
25 files changed, 213 insertions, 231 deletions
diff --git a/source/blender/makesdna/DNA_ID.h b/source/blender/makesdna/DNA_ID.h index eb8d06fc9f2..1737f3b79e6 100644 --- a/source/blender/makesdna/DNA_ID.h +++ b/source/blender/makesdna/DNA_ID.h @@ -54,15 +54,14 @@ typedef struct IDProperty { char type, subtype; short flag; char name[64]; /* MAX_IDPROP_NAME */ - int saved; /*saved is used to indicate if this struct has been saved yet. - seemed like a good idea as a pad var was needed anyway :)*/ + int saved; /* saved is used to indicate if this struct has been saved yet. + * 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.*/ /* 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.*/ + int totallen; /*strings and arrays are both buffered, though the buffer isn't saved.*/ } IDProperty; #define MAX_IDPROP_NAME 64 diff --git a/source/blender/makesdna/DNA_action_types.h b/source/blender/makesdna/DNA_action_types.h index 058c72be639..73aabd7d84b 100644 --- a/source/blender/makesdna/DNA_action_types.h +++ b/source/blender/makesdna/DNA_action_types.h @@ -416,7 +416,7 @@ typedef enum eItasc_Solver { /* Groups -------------------------------------- */ /* Action-Channel Group (agrp) - + * * These are stored as a list per-Action, and are only used to * group that Action's channels in an Animation Editor. * diff --git a/source/blender/makesdna/DNA_actuator_types.h b/source/blender/makesdna/DNA_actuator_types.h index 776231476ba..f4e06455c63 100644 --- a/source/blender/makesdna/DNA_actuator_types.h +++ b/source/blender/makesdna/DNA_actuator_types.h @@ -199,7 +199,7 @@ typedef struct bTwoDFilterActuator { /* Tells what type of 2D Filter */ short type; /* (flag == 0) means 2D filter is activate and - (flag != 0) means 2D filter is inactive */ + * (flag != 0) means 2D filter is inactive */ short flag; int int_arg; /* a float argument */ diff --git a/source/blender/makesdna/DNA_armature_types.h b/source/blender/makesdna/DNA_armature_types.h index f915b75a77f..b8b1f7d8b70 100644 --- a/source/blender/makesdna/DNA_armature_types.h +++ b/source/blender/makesdna/DNA_armature_types.h @@ -36,13 +36,13 @@ struct AnimData; /* this system works on different transformation space levels; - -1) Bone Space; with each Bone having own (0,0,0) origin -2) Armature Space; the rest position, in Object space, Bones Spaces are applied hierarchical -3) Pose Space; the animation position, in Object space -4) World Space; Object matrix applied to Pose or Armature space - -*/ + * + * 1) Bone Space; with each Bone having own (0,0,0) origin + * 2) Armature Space; the rest position, in Object space, Bones Spaces are applied hierarchical + * 3) Pose Space; the animation position, in Object space + * 4) World Space; Object matrix applied to Pose or Armature space + * + */ typedef struct Bone { struct Bone *next, *prev; /* Next/prev elements within this list */ diff --git a/source/blender/makesdna/DNA_camera_types.h b/source/blender/makesdna/DNA_camera_types.h index cdf20bd726a..112247f3d66 100644 --- a/source/blender/makesdna/DNA_camera_types.h +++ b/source/blender/makesdna/DNA_camera_types.h @@ -59,7 +59,7 @@ typedef struct Camera { /* yafray: dof params */ /* qdn: yafray var 'YF_dofdist' now enabled for defocus composite 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; struct Ipo *ipo DNA_DEPRECATED; /* old animation system, deprecated for 2.5 */ diff --git a/source/blender/makesdna/DNA_cloth_types.h b/source/blender/makesdna/DNA_cloth_types.h index 79a1d821543..fd8b08e68c6 100644 --- a/source/blender/makesdna/DNA_cloth_types.h +++ b/source/blender/makesdna/DNA_cloth_types.h @@ -33,16 +33,16 @@ #define __DNA_CLOTH_TYPES_H__ /** -* This struct contains all the global data required to run a simulation. -* At the time of this writing, this structure contains data appropriate -* to run a simulation as described in Deformation Constraints in a -* Mass-Spring Model to Describe Rigid Cloth Behavior by Xavier Provot. -* -* I've tried to keep similar, if not exact names for the variables as -* are presented in the paper. Where I've changed the concept slightly, -* as in stepsPerFrame comapred to the time step in the paper, I've used -* variables with different names to minimize confusion. -**/ + * This struct contains all the global data required to run a simulation. + * At the time of this writing, this structure contains data appropriate + * to run a simulation as described in Deformation Constraints in a + * Mass-Spring Model to Describe Rigid Cloth Behavior by Xavier Provot. + * + * I've tried to keep similar, if not exact names for the variables as + * are presented in the paper. Where I've changed the concept slightly, + * as in stepsPerFrame comapred to the time step in the paper, I've used + * variables with different names to minimize confusion. + */ typedef struct ClothSimSettings { diff --git a/source/blender/makesdna/DNA_curve_types.h b/source/blender/makesdna/DNA_curve_types.h index e311b6dffea..c9d80476fde 100644 --- a/source/blender/makesdna/DNA_curve_types.h +++ b/source/blender/makesdna/DNA_curve_types.h @@ -92,16 +92,16 @@ typedef struct BevPoint { */ /* note: alfa location in struct is abused by Key system */ /* vec in BezTriple looks like this: - vec[0][0]=x location of handle 1 - vec[0][1]=y location of handle 1 - vec[0][2]=z location of handle 1 (not used for FCurve Points(2d)) - vec[1][0]=x location of control point - vec[1][1]=y location of control point - vec[1][2]=z location of control point - vec[2][0]=x location of handle 2 - vec[2][1]=y location of handle 2 - vec[2][2]=z location of handle 2 (not used for FCurve Points(2d)) -*/ + * - vec[0][0]=x location of handle 1 + * - vec[0][1]=y location of handle 1 + * - vec[0][2]=z location of handle 1 (not used for FCurve Points(2d)) + * - vec[1][0]=x location of control point + * - vec[1][1]=y location of control point + * - vec[1][2]=z location of control point + * - vec[2][0]=x location of handle 2 + * - vec[2][1]=y location of handle 2 + * - vec[2][2]=z location of handle 2 (not used for FCurve Points(2d)) + */ 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 */ diff --git a/source/blender/makesdna/DNA_documentation.h b/source/blender/makesdna/DNA_documentation.h index c1d6ee4aec3..0dd7f37f8b4 100644 --- a/source/blender/makesdna/DNA_documentation.h +++ b/source/blender/makesdna/DNA_documentation.h @@ -60,14 +60,14 @@ * * DNA has no external dependencies (except for a few system * includes). - + * * \section dnanote NOTE - + * * PLEASE READ INSTRUCTIONS ABOUT ADDING VARIABLES IN 'DNA' STRUCTS IN * * intern/dna_genfile.c * (ton) - + * */ diff --git a/source/blender/makesdna/DNA_dynamicpaint_types.h b/source/blender/makesdna/DNA_dynamicpaint_types.h index fedc603fde2..ca1b1bf1725 100644 --- a/source/blender/makesdna/DNA_dynamicpaint_types.h +++ b/source/blender/makesdna/DNA_dynamicpaint_types.h @@ -159,7 +159,7 @@ typedef struct DynamicPaintCanvasSettings { #define MOD_DPAINT_PART_RAD (1<<0) /* use particle radius */ #define MOD_DPAINT_USE_MATERIAL (1<<1) /* use object material */ #define MOD_DPAINT_ABS_ALPHA (1<<2) /* don't increase alpha unless - paint alpha is higher than existing */ + * paint alpha is higher than existing */ #define MOD_DPAINT_ERASE (1<<3) /* removes paint */ #define MOD_DPAINT_RAMP_ALPHA (1<<4) /* only read falloff ramp alpha */ diff --git a/source/blender/makesdna/DNA_material_types.h b/source/blender/makesdna/DNA_material_types.h index 6416f3117dc..dcd4306600f 100644 --- a/source/blender/makesdna/DNA_material_types.h +++ b/source/blender/makesdna/DNA_material_types.h @@ -136,7 +136,7 @@ typedef struct Material { short diff_shader, spec_shader; float roughness, refrac; /* XXX param[4] needs review and improvement (shader system as whole anyway) - This is nasty reused variable for different goals and not easy to RNAify nicely. -jesterKing */ + * This is nasty reused variable for different goals and not easy to RNAify nicely. -jesterKing */ float param[4]; /* size, smooth, size, smooth, for toonshader, 0 (fac) and 1 (fresnel) also for fresnel shader */ float rms; float darkness; diff --git a/source/blender/makesdna/DNA_mesh_types.h b/source/blender/makesdna/DNA_mesh_types.h index 13186a9e780..48704fe43d4 100644 --- a/source/blender/makesdna/DNA_mesh_types.h +++ b/source/blender/makesdna/DNA_mesh_types.h @@ -77,8 +77,8 @@ typedef struct Mesh { struct MLoopCol *mloopcol; /* END BMESH ONLY */ - /*mface stores the tessellation (triangulation) of the mesh, - real faces are now stored in nface.*/ + /* mface stores the tessellation (triangulation) of the mesh, + * real faces are now stored in nface.*/ struct MFace *mface; /* array of mesh object mode faces for tessellation */ struct MTFace *mtface; /* store tessellation face UV's and texture here */ struct TFace *tface; /* depecrated, use mtface */ @@ -87,7 +87,7 @@ typedef struct Mesh { struct MDeformVert *dvert; /* deformgroup vertices */ /* array of colors for the tesselated faces, must be number of tesselated - faces * 4 in length */ + * faces * 4 in length */ struct MCol *mcol; struct MSticky *msticky; struct Mesh *texcomesh; @@ -194,27 +194,6 @@ typedef struct TFace { /* debug only option */ #define ME_DRAWEXTRA_INDICES (1 << 13) -/* old global flags: -#define G_DRAWEDGES (1 << 18) -#define G_DRAWFACES (1 << 7) -#define G_DRAWNORMALS (1 << 6) -#define G_DRAW_VNORMALS (1 << 14) - -#define G_ALLEDGES (1 << 11) -#define G_HIDDENEDGES (1 << 21) - -#define G_DRAWCREASES (1 << 19) -#define G_DRAWSEAMS (1 << 20) -#define G_DRAWSHARP (1 << 28) -#define G_DRAWBWEIGHTS (1 << 31) - -#define G_DRAW_EDGELEN (1 << 22) -#define G_DRAW_FACEAREA (1 << 23) -#define G_DRAW_EDGEANG (1 << 24) -*/ - - - /* Subsurf Type */ #define ME_CC_SUBSURF 0 #define ME_SIMPLE_SUBSURF 1 diff --git a/source/blender/makesdna/DNA_meshdata_types.h b/source/blender/makesdna/DNA_meshdata_types.h index be2a676778f..4367d259b1f 100644 --- a/source/blender/makesdna/DNA_meshdata_types.h +++ b/source/blender/makesdna/DNA_meshdata_types.h @@ -75,8 +75,8 @@ typedef struct MCol { char a, r, g, b; } MCol; -/*new face structure, replaces MFace, which is now - only used for storing tessellations.*/ +/* new face structure, replaces MFace, which is now + * only used for storing tessellations.*/ typedef struct MPoly { /* offset into loop array and number of loops in the face */ int loopstart; @@ -85,8 +85,8 @@ typedef struct MPoly { char flag, pad; } MPoly; -/*the e here is because we want to move away from - relying on edge hashes.*/ +/* the e here is because we want to move away from + * relying on edge hashes.*/ typedef struct MLoop { unsigned int v; /*vertex index*/ unsigned int e; /*edge index*/ diff --git a/source/blender/makesdna/DNA_meta_types.h b/source/blender/makesdna/DNA_meta_types.h index 9c20b8f644b..2912650c77c 100644 --- a/source/blender/makesdna/DNA_meta_types.h +++ b/source/blender/makesdna/DNA_meta_types.h @@ -87,8 +87,8 @@ typedef struct MetaBall { 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 */ + * mother ball changes will effect other objects thresholds, + * but these may also have their own thresh as an offset */ float thresh; /* used in editmode */ diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h index a848c3edd49..f00bd338fd5 100644 --- a/source/blender/makesdna/DNA_modifier_types.h +++ b/source/blender/makesdna/DNA_modifier_types.h @@ -191,33 +191,33 @@ typedef struct ArrayModifierData { /* the object to use for object offset */ struct Object *offset_ob; /* a constant duplicate offset; - 1 means the duplicates are 1 unit apart - */ + * 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 - */ + * 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 - total offset is the sum of the individual enabled offsets - */ + * - 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 */ int count; @@ -1045,7 +1045,7 @@ typedef struct RemeshModifierData { ModifierData modifier; /* floodfill option, controls how small components can be - before they are removed */ + * before they are removed */ float threshold; /* ratio between size of model and grid */ diff --git a/source/blender/makesdna/DNA_movieclip_types.h b/source/blender/makesdna/DNA_movieclip_types.h index f764042ee5d..b4e6c07cec3 100644 --- a/source/blender/makesdna/DNA_movieclip_types.h +++ b/source/blender/makesdna/DNA_movieclip_types.h @@ -78,8 +78,8 @@ typedef struct MovieClip { struct MovieTracking tracking; /* data for SfM tracking */ void *tracking_context; /* context of tracking job - used to synchronize data like framenumber - in SpaceClip clip user */ + * used to synchronize data like framenumber + * in SpaceClip clip user */ struct MovieClipProxy proxy; /* proxy to clip data */ int flag, pad; diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h index dbb3f6bfc66..6caf0a7d8b2 100644 --- a/source/blender/makesdna/DNA_node_types.h +++ b/source/blender/makesdna/DNA_node_types.h @@ -238,7 +238,7 @@ typedef struct bNodeTree { int type, init; /* set init on fileread */ int cur_index; /* sockets in groups have unique identifiers, adding new sockets always - will increase this counter */ + * will increase this counter */ int flag; int update; /* update flags */ diff --git a/source/blender/makesdna/DNA_object_force.h b/source/blender/makesdna/DNA_object_force.h index 6b11fd0766f..0e70b5d28e3 100644 --- a/source/blender/makesdna/DNA_object_force.h +++ b/source/blender/makesdna/DNA_object_force.h @@ -130,7 +130,7 @@ typedef struct EffectorWeights { * - to add new data types update: * * BKE_ptcache_data_size() * * ptcache_file_init_pointers() -*/ + */ #define BPHYS_DATA_INDEX 0 #define BPHYS_DATA_LOCATION 1 #define BPHYS_DATA_SMOKE_LOW 1 @@ -276,9 +276,10 @@ typedef struct SoftBody { /* general options */ float nodemass; /* softbody mass of *vertex* */ - char namedVG_Mass[64]; /* MAX_VGROUP_NAME */ /* along with it introduce mass painting - starting to fix old bug .. nastyness that VG are indexes - rather find them by name tag to find it -> jow20090613 */ + char namedVG_Mass[64]; /* MAX_VGROUP_NAME */ + /* along with it introduce mass painting + * starting to fix old bug .. nastyness that VG are indexes + * rather find them by name tag to find it -> jow20090613 */ float grav; /* softbody amount of gravitaion to apply */ float mediafrict; /* friction to env */ float rklimit; /* error limit for ODE solver */ @@ -291,17 +292,19 @@ typedef struct SoftBody { float maxgoal; float defgoal; /* default goal for vertices without vgroup */ short vertgroup; /* index starting at 1 */ - char namedVG_Softgoal[64]; /* MAX_VGROUP_NAME */ /* starting to fix old bug .. nastyness that VG are indexes - rather find them by name tag to find it -> jow20090613 */ + char namedVG_Softgoal[64]; /* MAX_VGROUP_NAME */ + /* starting to fix old bug .. nastyness that VG are indexes + * rather find them by name tag to find it -> jow20090613 */ short fuzzyness; /* */ /* springs */ float inspring; /* softbody inner springs */ float infrict; /* softbody inner springs friction */ - char namedVG_Spring_K[64]; /* MAX_VGROUP_NAME */ /* 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 */ + char namedVG_Spring_K[64]; /* MAX_VGROUP_NAME */ + /* 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 */ /* baking */ int sfra, efra; diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index 3d80e9a08d3..79ed1186c1a 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -614,7 +614,7 @@ typedef struct GameData { /* * bit 3: (gameengine): Activity culling is enabled. * bit 5: (gameengine) : enable Bullet DBVT tree for view frustrum culling - */ + */ int flag; short mode, matmode; short occlusionRes; /* resolution of occlusion Z buffer in pixel */ @@ -837,11 +837,12 @@ typedef struct TransformOrientation { } TransformOrientation; /* *************************************************************** */ -/* Unified Paint Settings */ +/* Unified Paint Settings + */ /* These settings can override the equivalent fields in the active - Brush for any paint mode; the flag field controls whether these - values are used */ + * Brush for any paint mode; the flag field controls whether these + * values are used */ typedef struct UnifiedPaintSettings { /* unified radius of brush in pixels */ int size; @@ -861,12 +862,12 @@ typedef enum { UNIFIED_PAINT_ALPHA = (1<<1), /* only used if unified size is enabled, mirros the brush flags - BRUSH_LOCK_SIZE and BRUSH_SIZE_PRESSURE */ + * BRUSH_LOCK_SIZE and BRUSH_SIZE_PRESSURE */ UNIFIED_PAINT_BRUSH_LOCK_SIZE = (1<<2), UNIFIED_PAINT_BRUSH_SIZE_PRESSURE = (1<<3), /* only used if unified alpha is enabled, mirrors the brush flag - BRUSH_ALPHA_PRESSURE */ + * BRUSH_ALPHA_PRESSURE */ UNIFIED_PAINT_BRUSH_ALPHA_PRESSURE = (1<<4) } UnifiedPaintSettingsFlags; @@ -995,7 +996,7 @@ typedef struct ToolSettings { int uv_sculpt_tool; int uv_relax_method; /* XXX: these sculpt_paint_* fields are deprecated, use the - unified_paint_settings field instead! */ + * unified_paint_settings field instead! */ short sculpt_paint_settings DNA_DEPRECATED; short pad1; int sculpt_paint_unified_size DNA_DEPRECATED; float sculpt_paint_unified_unprojected_radius DNA_DEPRECATED; diff --git a/source/blender/makesdna/DNA_sdna_types.h b/source/blender/makesdna/DNA_sdna_types.h index 97b65235a29..ec02db192fd 100644 --- a/source/blender/makesdna/DNA_sdna_types.h +++ b/source/blender/makesdna/DNA_sdna_types.h @@ -48,14 +48,14 @@ typedef struct SDNA { short *typelens; /* type lengths */ int nr_structs; /* number of struct types */ - short **structs; /* sp= structs[a] is the address of a struct definintion - 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 */ + short **structs; /* sp = structs[a] is the address of a struct definintion + * 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 */ struct GHash *structs_map; /* ghash for faster lookups, - requires WITH_DNA_GHASH to be used for now */ + * requires WITH_DNA_GHASH to be used for now */ /* wrong place for this really, its a simple * cache for findstruct_nr. diff --git a/source/blender/makesdna/DNA_smoke_types.h b/source/blender/makesdna/DNA_smoke_types.h index 894e1135c0d..053c0c8f7d3 100644 --- a/source/blender/makesdna/DNA_smoke_types.h +++ b/source/blender/makesdna/DNA_smoke_types.h @@ -109,8 +109,7 @@ typedef struct SmokeDomainSettings { /* flags */ #define MOD_SMOKE_FLOW_ABSOLUTE (1<<1) /*old style emission*/ -#define MOD_SMOKE_FLOW_INITVELOCITY (1<<2) /* passes particles speed to - the smoke*/ +#define MOD_SMOKE_FLOW_INITVELOCITY (1<<2) /* passes particles speed to the smoke */ typedef struct SmokeFlowSettings { @@ -128,11 +127,10 @@ typedef struct SmokeFlowSettings { int flags; /* absolute emission etc*/ } SmokeFlowSettings; -/* - struct BVHTreeFromMesh *bvh; - float mat[4][4]; - float mat_old[4][4]; - */ + +// struct BVHTreeFromMesh *bvh; +// float mat[4][4]; +// float mat_old[4][4]; /* collision objects (filled with smoke) */ typedef struct SmokeCollSettings { diff --git a/source/blender/makesdna/DNA_sound_types.h b/source/blender/makesdna/DNA_sound_types.h index 1fab63f9d63..67683979e2e 100644 --- a/source/blender/makesdna/DNA_sound_types.h +++ b/source/blender/makesdna/DNA_sound_types.h @@ -75,8 +75,8 @@ typedef struct bSound { int flags; int pad; -/** currently int type; - struct bSound *child_sound;*/ +// currently int type; +// struct bSound *child_sound;*/ /** * The audaspace handle for cache. @@ -94,17 +94,19 @@ typedef struct bSound { */ void *playback_handle; -/** XXX unused currently // SOUND_TYPE_LIMITER - float start, end;*/ +// XXX unused currently // SOUND_TYPE_LIMITER +// float start, end;*/ } bSound; -/* XXX unused currently +/* XXX unused currently */ +#if 0 typedef enum eSound_Type { SOUND_TYPE_INVALID = -1, SOUND_TYPE_FILE = 0, SOUND_TYPE_BUFFER, SOUND_TYPE_LIMITER -} eSound_Type;*/ +} eSound_Type; +#endif /* spacesound->flag */ #define SND_DRAWFRAMES 1 diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h index 7b633523ef8..128c1422ed6 100644 --- a/source/blender/makesdna/DNA_space_types.h +++ b/source/blender/makesdna/DNA_space_types.h @@ -215,10 +215,10 @@ typedef struct SpaceFile { ListBase *folders_next; /* holds the list of next directories (pushed from previous) to show */ /* operator that is invoking fileselect - op->exec() will be called on the 'Load' button. - if operator provides op->cancel(), then this will be invoked - on the cancel button. - */ + * op->exec() will be called on the 'Load' button. + * if operator provides op->cancel(), then this will be invoked + * on the cancel button. + */ struct wmOperator *op; struct wmTimer *smoothscroll_timer; @@ -516,8 +516,8 @@ typedef struct SpaceClip { /* current stabilization data */ float loc[2], scale, angle; /* pre-composed stabilization data */ int pad; - float stabmat[4][4], unistabmat[4][4]; /* current stabilization matrix and the same matrix in unified space, - defined when drawing and used for mouse position calculation */ + float stabmat[4][4], unistabmat[4][4]; /* current stabilization matrix and the same matrix in unified space, + * defined when drawing and used for mouse position calculation */ /* movie postprocessing */ int postproc_flag; diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index e72b7dcfa72..2243eb357fc 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -619,11 +619,11 @@ extern UserDef U; /* from blenkernel blender.c */ /* orbit navigation modes * only two options, so it's sort of a hybrid bool/enum * if ((U.ndof_flag & NDOF_ORBIT_MODE) == NDOF_OM_OBJECT)... */ -/* -#define NDOF_ORBIT_MODE (1 << 6) -#define NDOF_OM_TARGETCAMERA 0 -#define NDOF_OM_OBJECT NDOF_ORBIT_MODE -*/ + +// #define NDOF_ORBIT_MODE (1 << 6) +// #define NDOF_OM_TARGETCAMERA 0 +// #define NDOF_OM_OBJECT NDOF_ORBIT_MODE + /* actually... users probably don't care about what the mode * is called, just that it feels right */ /* zoom is up/down if this flag is set (otherwise forward/backward) */ diff --git a/source/blender/makesdna/intern/dna_genfile.c b/source/blender/makesdna/intern/dna_genfile.c index a332c77c402..2148bc96c04 100644 --- a/source/blender/makesdna/intern/dna_genfile.c +++ b/source/blender/makesdna/intern/dna_genfile.c @@ -51,90 +51,90 @@ /* gcc 4.1 on mingw was complaining that __int64 was already defined -actually is saw the line below as typedef long long long long... -Anyhow, since its already defined, its safe to do an ifndef here- Campbell */ + * actually is saw the line below as typedef long long long long... + * Anyhow, since its already defined, its safe to do an ifndef here- Campbell */ #ifdef FREE_WINDOWS -#ifndef __int64 +# ifndef __int64 typedef long long __int64; -#endif +# endif #endif /* * - please note: no builtin security to detect input of double structs * - if you want a struct not to be in DNA file: add two hash marks above it (#<enter>#<enter>) - -Structure DNA data is added to each blender file and to each executable, this to detect -in .blend files new veriables in structs, changed array sizes, etc. It's also used for -converting endian and pointer size (32-64 bits) -As an extra, Python uses a call to detect run-time the contents of a blender struct. - -Create a structDNA: only needed when one of the input include (.h) files change. -File Syntax: - SDNA (4 bytes) (magic number) - NAME (4 bytes) - <nr> (4 bytes) amount of names (int) - <string> - <string> - ... - ... - TYPE (4 bytes) - <nr> amount of types (int) - <string> - <string> - ... - ... - TLEN (4 bytes) - <len> (short) the lengths of types - <len> - ... - ... - STRC (4 bytes) - <nr> amount of structs (int) - <typenr><nr_of_elems> <typenr><namenr> <typenr><namenr> ... - -!!Remember to read/write integer and short aligned!! - - While writing a file, the names of a struct is indicated with a type number, - to be found with: type= findstruct_nr(SDNA *, char *) - The value of 'type' corresponds with the the index within the structs array - - For the moment: the complete DNA file is included in a .blend file. For - the future we can think of smarter methods, like only included the used - structs. Only needed to keep a file short though... - -ALLOWED AND TESTED CHANGES IN STRUCTS: - - type change (a char to float will be divided by 255) - - location within a struct (everthing can be randomly mixed up) - - struct within struct (within struct etc), this is recursive - - adding new elements, will be default initialized zero - - remving elements - - change of array sizes - - change of a pointer type: when the name doesn't change the contents is copied - -NOT YET: - - array (vec[3]) to float struct (vec3f) - -DONE: - - endian compatibility - - pointer conversion (32-64 bits) - -IMPORTANT: - - do not use #defines in structs for array lengths, this cannot be read by the dna functions - - do not use uint, but unsigned int instead, ushort and ulong are allowed - - only use a long in Blender if you want this to be the size of a pointer. so it is - 32 bits or 64 bits, dependent at the cpu architecture - - chars are always unsigned - - aligment of variables has to be done in such a way, that any system does - not create 'padding' (gaps) in structures. So make sure that: - - short: 2 aligned - - int: 4 aligned - - float: 4 aligned - - double: 8 aligned - - long: 8 aligned - - struct: 8 aligned - - the sdna functions have several error prints builtin, always check blender running from a console. - -*/ + * + * Structure DNA data is added to each blender file and to each executable, this to detect + * in .blend files new veriables in structs, changed array sizes, etc. It's also used for + * converting endian and pointer size (32-64 bits) + * As an extra, Python uses a call to detect run-time the contents of a blender struct. + * + * Create a structDNA: only needed when one of the input include (.h) files change. + * File Syntax: + * SDNA (4 bytes) (magic number) + * NAME (4 bytes) + * <nr> (4 bytes) amount of names (int) + * <string> + * <string> + * ... + * ... + * TYPE (4 bytes) + * <nr> amount of types (int) + * <string> + * <string> + * ... + * ... + * TLEN (4 bytes) + * <len> (short) the lengths of types + * <len> + * ... + * ... + * STRC (4 bytes) + * <nr> amount of structs (int) + * <typenr><nr_of_elems> <typenr><namenr> <typenr><namenr> ... + * + * !!Remember to read/write integer and short aligned!! + * + * While writing a file, the names of a struct is indicated with a type number, + * to be found with: type= findstruct_nr(SDNA *, char *) + * The value of 'type' corresponds with the the index within the structs array + * + * For the moment: the complete DNA file is included in a .blend file. For + * the future we can think of smarter methods, like only included the used + * structs. Only needed to keep a file short though... + * + * ALLOWED AND TESTED CHANGES IN STRUCTS: + * - type change (a char to float will be divided by 255) + * - location within a struct (everthing can be randomly mixed up) + * - struct within struct (within struct etc), this is recursive + * - adding new elements, will be default initialized zero + * - remving elements + * - change of array sizes + * - change of a pointer type: when the name doesn't change the contents is copied + * + * NOT YET: + * - array (vec[3]) to float struct (vec3f) + * + * DONE: + * - endian compatibility + * - pointer conversion (32-64 bits) + * + * IMPORTANT: + * - do not use #defines in structs for array lengths, this cannot be read by the dna functions + * - do not use uint, but unsigned int instead, ushort and ulong are allowed + * - only use a long in Blender if you want this to be the size of a pointer. so it is + * 32 bits or 64 bits, dependent at the cpu architecture + * - chars are always unsigned + * - aligment of variables has to be done in such a way, that any system does + * not create 'padding' (gaps) in structures. So make sure that: + * - short: 2 aligned + * - int: 4 aligned + * - float: 4 aligned + * - double: 8 aligned + * - long: 8 aligned + * - struct: 8 aligned + * - the sdna functions have several error prints builtin, always check blender running from a console. + * + */ /* local */ static int le_int(int temp); @@ -351,8 +351,8 @@ static void init_structDNA(SDNA *sdna, int do_endian_swap) sdna->names[nr]= cp; /* "float gravity [3]" was parsed wrong giving both "gravity" and - "[3]" members. we rename "[3]", and later set the type of - "gravity" to "void" so the offsets work out correct */ + * "[3]" members. we rename "[3]", and later set the type of + * "gravity" to "void" so the offsets work out correct */ if(*cp == '[' && strcmp(cp, "[3]")==0) { if(nr && strcmp(sdna->names[nr-1], "Cvi") == 0) { sdna->names[nr]= "gravity[3]"; @@ -644,14 +644,14 @@ char *DNA_struct_get_compareflags(SDNA *sdna, SDNA *newsdna) if(compflags[a]==2) recurs_test_compflags(sdna, compflags, a); } -/* +#if 0 for(a=0; a<sdna->nr_structs; a++) { if(compflags[a]==2) { spold= sdna->structs[a]; printf("changed: %s\n", sdna->types[ spold[0] ]); } } -*/ +#endif return compflags; } @@ -843,14 +843,14 @@ static void reconstruct_elem(SDNA *newsdna, SDNA *oldsdna, char *type, const char *name, char *curdata, short *old, char *olddata) { /* rules: test for NAME: - - name equal: - - cast type - - name partially equal (array differs) - - type equal: memcpy - - types casten - (nzc 2-4-2001 I want the 'unsigned' bit to be parsed as well. Where - can I force this?) - */ + * - name equal: + * - cast type + * - name partially equal (array differs) + * - type equal: memcpy + * - types casten + * (nzc 2-4-2001 I want the 'unsigned' bit to be parsed as well. Where + * can I force this?) + */ int a, elemcount, len, array, oldsize, cursize, mul; char *otype; const char *oname, *cp; diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c index 77f3e8084dd..42fe26d87a9 100644 --- a/source/blender/makesdna/intern/makesdna.c +++ b/source/blender/makesdna/intern/makesdna.c @@ -146,9 +146,9 @@ static char **types, *typedata; /* at address types[a] is string a */ static short *typelens; /* at typelens[a] is de length of type a */ static short *alphalens; /* contains sizes as they are calculated on the DEC Alpha (64 bits), infact any 64bit system */ static short **structs, *structdata;/* at sp= structs[a] is the first address of a struct definition - sp[0] is type number - sp[1] is amount of elements - sp[2] sp[3] is typenr, namenr (etc) */ + * sp[0] is type number + * sp[1] is amount of elements + * sp[2] sp[3] is typenr, namenr (etc) */ /** * Variable to control debug output of makesdna. * debugSDNA: @@ -289,9 +289,9 @@ static int add_name(const char *str) if (str[0] == '(' && str[1] == '*') { /* we handle function pointer and special array cases here, e.g. - void (*function)(...) and float (*array)[..]. the array case - name is still converted to (array*)() though because it is that - way in old dna too, and works correct with elementsize() */ + * void (*function)(...) and float (*array)[..]. the array case + * name is still converted to (array*)() though because it is that + * way in old dna too, and works correct with elementsize() */ int isfuncptr = (strchr(str+1, '(')) != NULL; if (debugSDNA > 3) printf("\t\t\t\t*** Function pointer or multidim array pointer found\n"); @@ -539,8 +539,8 @@ static void *read_file_data(char *filename, int *len_r) static int convert_include(char *filename) { /* read include file, skip structs with a '#' before it. - store all data in temporal arrays. - */ + * store all data in temporal arrays. + */ int filelen, count, overslaan, slen, type, name, strct; short *structpoin, *sp; char *maindata, *mainend, *md, *md1; |