griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: corrections to last commit

Browse Source
This commit is contained in:
Campbell Barton
2019-01-08 01:00:40 +11:00
parent 5a43406e1b
commit 299ff7dcd1
13 changed files with 79 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/blender/makesdna/DNA_action_types.h
View File

@@ -120,27 +120,27 @@ typedef struct bAnimVizSettings {
/** Number of frames befo.re/after current frame to show */ /** Number of frames befo.re/after current frame to show */
int ghost_bc, ghost_ac; int ghost_bc, ghost_ac;
/** EOnionSkin_Types. */ /** #eOnionSkin_Types. */
short ghost_type; short ghost_type;
/** Number of frames between each ghost shown (not for GHOST_TYPE_KEYS). */ /** Number of frames between each ghost shown (not for GHOST_TYPE_KEYS). */
short ghost_step; short ghost_step;
/** EOnionSkin_Flag. */ /** #eOnionSkin_Flag. */
short ghost_flag; short ghost_flag;
/* General Settings ------------------------ */ /* General Settings ------------------------ */
/** EAnimViz_RecalcFlags. */ /** #eAnimViz_RecalcFlags. */
short recalc; short recalc;
/* Motion Path Settings ------------------- */ /* Motion Path Settings ------------------- */
/** EMotionPath_Types. */ /** #eMotionPath_Types. */
short path_type; short path_type;
/** Number of frames between points indicated on the paths. */ /** Number of frames between points indicated on the paths. */
short path_step; short path_step;
/** EMotionPaths_ViewFlag. */ /** #eMotionPaths_ViewFlag. */
short path_viewflag; short path_viewflag;
/** EMotionPaths_BakeFlag. */ /** #eMotionPaths_BakeFlag. */
short path_bakeflag; short path_bakeflag;
/** Start and end frames of path-calculation range. */ /** Start and end frames of path-calculation range. */
@@ -313,7 +313,7 @@ typedef struct bPoseChannel {
float quat[4]; float quat[4];
/** Axis-angle rotation. */ /** Axis-angle rotation. */
float rotAxis[3], rotAngle; float rotAxis[3], rotAngle;
/** ERotationModes - rotation representation to use. */ /** #eRotationModes - rotation representation to use. */
short rotmode; short rotmode;
short pad; short pad;

4
source/blender/makesdna/DNA_anim_types.h
View File

@@ -167,9 +167,9 @@ typedef struct FMod_FunctionGenerator {
float value_offset; float value_offset;
/* flags */ /* flags */
/** EFMod_Generator_Functions. */ /** #eFMod_Generator_Functions. */
int type; int type;
/** EFMod_Generator_flags. */ /** #eFMod_Generator_flags. */
int flag; int flag;
} FMod_FunctionGenerator; } FMod_FunctionGenerator;

26
source/blender/makesdna/DNA_cloth_types.h
View File

@@ -53,19 +53,19 @@ typedef struct ClothSimSettings {
float mingoal; float mingoal;
/** Mechanical damping of springs. */ /** Mechanical damping of springs. */
float Cdis DNA_DEPRECATED; float Cdis DNA_DEPRECATED;
/** Viscous/fluid damping. . */ /** Viscous/fluid damping. */
float Cvi; float Cvi;
/** Gravity/external force vector. . */ /** Gravity/external force vector. */
float gravity[3]; float gravity[3];
/** This is the duration of our time step, computed.. */ /** This is the duration of our time step, computed.. */
float dt; float dt;
/** The mass of the entire cloth. . */ /** The mass of the entire cloth. */
float mass; float mass;
/** Structural spring stiffness. */ /** Structural spring stiffness. */
float structural DNA_DEPRECATED; float structural DNA_DEPRECATED;
/** Shear spring stiffness. . */ /** Shear spring stiffness. */
float shear; float shear;
/** Flexion spring stiffness. . */ /** Flexion spring stiffness. */
float bending; float bending;
/** Max bending scaling value, min is "bending". */ /** Max bending scaling value, min is "bending". */
float max_bend; float max_bend;
@@ -115,15 +115,15 @@ typedef struct ClothSimSettings {
float voxel_cell_size; float voxel_cell_size;
int pad; int pad;
/** Number of time steps per frame. . */ /** Number of time steps per frame. */
int stepsPerFrame; int stepsPerFrame;
/** Flags, see CSIMSETT_FLAGS enum above.. */ /** Flags, see CSIMSETT_FLAGS enum above. */
int flags; int flags;
/** How many frames of simulation to do before we start.. */ /** How many frames of simulation to do before we start. */
int preroll DNA_DEPRECATED; int preroll DNA_DEPRECATED;
/** In percent!; if tearing enabled, a spring will get cut. */ /** In percent!; if tearing enabled, a spring will get cut. */
int maxspringlen; int maxspringlen;
/** Which solver should be used? txold. */ /** Which solver should be used? txold. */
short solver_type; short solver_type;
/** Vertex group for scaling bending stiffness. */ /** Vertex group for scaling bending stiffness. */
short vgroup_bend; short vgroup_bend;
@@ -161,13 +161,13 @@ typedef struct ClothSimSettings {
typedef struct ClothCollSettings { typedef struct ClothCollSettings {
/** E.g. pointer to temp memory for collisions. */ /** E.g. pointer to temp memory for collisions. */
struct LinkNode *collision_list; struct LinkNode *collision_list;
/** Min distance for collisions. . */ /** Min distance for collisions. */
float epsilon; float epsilon;
/** Fiction/damping with self contact. */ /** Fiction/damping with self contact. */
float self_friction; float self_friction;
/** Friction/damping applied on contact with other object..*/ /** Friction/damping applied on contact with other object. */
float friction; float friction;
/** Collision restitution on contact with other object..*/ /** Collision restitution on contact with other object. */
float damping; float damping;
/** For selfcollision. */ /** For selfcollision. */
float selfepsilon; float selfepsilon;
@@ -177,7 +177,7 @@ typedef struct ClothCollSettings {
int flags; int flags;
/** How many iterations for the selfcollision loop. */ /** How many iterations for the selfcollision loop. */
short self_loop_count DNA_DEPRECATED; short self_loop_count DNA_DEPRECATED;
/** How many iterations for the collision loop. . */ /** How many iterations for the collision loop. */
short loop_count; short loop_count;
int pad; int pad;
/** Only use colliders from this group of objects. */ /** Only use colliders from this group of objects. */

4
source/blender/makesdna/DNA_constraint_types.h
View File

@@ -485,11 +485,11 @@ typedef struct bPivotConstraint {
/* Rotation-driven activation: /* Rotation-driven activation:
* This option provides easier one-stop setups for footrolls * This option provides easier one-stop setups for footrolls
*/ */
/** Rotation axes to consider for this (ePivotConstraint_Axis). */ /** Rotation axes to consider for this (#ePivotConstraint_Axis). */
short rotAxis; short rotAxis;
/* General flags */ /* General flags */
/** EPivotConstraint_Flag. */ /** #ePivotConstraint_Flag. */
short flag; short flag;
} bPivotConstraint; } bPivotConstraint;

2
source/blender/makesdna/DNA_gpu_types.h
View File

@@ -59,7 +59,7 @@ typedef struct GPUSSAOSettings {
typedef struct GPUFXSettings { typedef struct GPUFXSettings {
GPUDOFSettings *dof; GPUDOFSettings *dof;
GPUSSAOSettings *ssao; GPUSSAOSettings *ssao;
/** EGPUFXFlags. */ /** #eGPUFXFlags. */
char fx_flag; char fx_flag;
char pad[7]; char pad[7];
} GPUFXSettings; } GPUFXSettings;

2
source/blender/makesdna/DNA_modifier_types.h
View File

@@ -1439,7 +1439,7 @@ typedef struct DynamicPaintModifierData {
struct DynamicPaintCanvasSettings *canvas; struct DynamicPaintCanvasSettings *canvas;
struct DynamicPaintBrushSettings *brush; struct DynamicPaintBrushSettings *brush;
/** Ui display: canvas / brush. */ /** UI display: canvas / brush. */
int type; int type;
int pad; int pad;
} DynamicPaintModifierData; } DynamicPaintModifierData;

2
source/blender/makesdna/DNA_movieclip_types.h
View File

@@ -137,7 +137,7 @@ typedef struct MovieClipScopes {
struct MovieTrackingMarker undist_marker; struct MovieTrackingMarker undist_marker;
/** Search area of a track. */ /** Search area of a track. */
struct ImBuf *track_search; struct ImBuf *track_search;
/** ImBuf displayed in track preview. */ /** #ImBuf displayed in track preview. */
struct ImBuf *track_preview; struct ImBuf *track_preview;
/** Sub-pizel position of marker in track ImBuf. */ /** Sub-pizel position of marker in track ImBuf. */
float track_pos[2]; float track_pos[2];

53
source/blender/makesdna/DNA_object_force_types.h
View File

@@ -55,35 +55,36 @@ typedef enum ePFieldType {
PFIELD_BOID = 10, /* Defines predator / goal for boids */ PFIELD_BOID = 10, /* Defines predator / goal for boids */
PFIELD_TURBULENCE = 11, /* Force defined by BLI_gTurbulence */ PFIELD_TURBULENCE = 11, /* Force defined by BLI_gTurbulence */
PFIELD_DRAG = 12, /* Linear & quadratic drag */ PFIELD_DRAG = 12, /* Linear & quadratic drag */
PFIELD_SMOKEFLOW = 13, /* Force based on smoke simulation air flow */ PFIELD_SMOKEFLOW = 1301, /* Force based on smoke simulation air flow */
NUM_PFIELD_TYPES NUM_PFIELD_TYPES
} ePFieldType; } ePFieldType;
typedef struct PartDeflect { typedef struct PartDeflect {
/** General settings flag . */ /** General settings flag. */
int flag; int flag;
/** Deflection flag - does mesh deflect particles . */ /** Deflection flag - does mesh deflect particles. */
short deflect; short deflect;
/** Force field type, do the vertices attract / repel particles?. */ /** Force field type, do the vertices attract / repel particles? */
short forcefield; short forcefield;
/** Fall-off type . */ /** Fall-off type. */
short falloff; short falloff;
/** Point, plane or surface . */ /** Point, plane or surface. */
short shape; short shape;
/** Texture effector . */ /** Texture effector. */
short tex_mode; short tex_mode;
/** For curve guide . */ /** For curve guide. */
short kink, kink_axis; short kink, kink_axis;
short zdir; short zdir;
/* Main effector values */ /* Main effector values */
/** The strength of the force (+ or - ) . */ /** The strength of the force (+ or - ). */
float f_strength; float f_strength;
/** Damping ratio of the harmonic effector. . */ /** Damping ratio of the harmonic effector. */
float f_damp; float f_damp;
/** How much force is converted into "air flow", i.e.. */ /**
* How much force is converted into "air flow", i.e.
* force used as the velocity of surrounding medium. */
float f_flow; float f_flow;
/* force used as the velocity of surrounding medium. */
/** Noise size for noise effector, restlength for harmonic effector. */ /** Noise size for noise effector, restlength for harmonic effector. */
float f_size; float f_size;
@@ -91,35 +92,35 @@ typedef struct PartDeflect {
/* fall-off */ /* fall-off */
/** The power law - real gravitation is 2 (square). */ /** The power law - real gravitation is 2 (square). */
float f_power; float f_power;
/** If indicated, use this maximum . */ /** If indicated, use this maximum. */
float maxdist; float maxdist;
/** If indicated, use this minimum . */ /** If indicated, use this minimum. */
float mindist; float mindist;
/** Radial fall-off power . */ /** Radial fall-off power. */
float f_power_r; float f_power_r;
/** Radial versions of above . */ /** Radial versions of above. */
float maxrad; float maxrad;
float minrad; float minrad;
/* particle collisions */ /* particle collisions */
/** Damping factor for particle deflection . */ /** Damping factor for particle deflection. */
float pdef_damp; float pdef_damp;
/** Random element of damping for deflection . */ /** Random element of damping for deflection. */
float pdef_rdamp; float pdef_rdamp;
/** Chance of particle passing through mesh . */ /** Chance of particle passing through mesh. */
float pdef_perm; float pdef_perm;
/** Friction factor for particle deflection . */ /** Friction factor for particle deflection. */
float pdef_frict; float pdef_frict;
/** Random element of friction for deflection. */ /** Random element of friction for deflection. */
float pdef_rfrict; float pdef_rfrict;
/** Surface particle stickiness . */ /** Surface particle stickiness. */
float pdef_stickness; float pdef_stickness;
/** Used for forces. */ /** Used for forces. */
float absorption; float absorption;
/* softbody collisions */ /* softbody collisions */
/** Damping factor for softbody deflection . */ /** Damping factor for softbody deflection. */
float pdef_sbdamp; float pdef_sbdamp;
/** Inner face thickness for softbody deflection. */ /** Inner face thickness for softbody deflection. */
float pdef_sbift; float pdef_sbift;
@@ -133,15 +134,15 @@ typedef struct PartDeflect {
/* texture effector */ /* texture effector */
/** Used for calculating partial derivatives. */ /** Used for calculating partial derivatives. */
float tex_nabla; float tex_nabla;
/** Texture of the texture effector . */ /** Texture of the texture effector. */
struct Tex *tex; struct Tex *tex;
/* effector noise */ /* effector noise */
/** Random noise generator for e.g. wind. */ /** Random noise generator for e.g. wind. */
struct RNG *rng; struct RNG *rng;
/** Noise of force . */ /** Noise of force. */
float f_noise; float f_noise;
/** Noise random seed . */ /** Noise random seed. */
int seed; int seed;
/* Display Size */ /* Display Size */

14
source/blender/makesdna/DNA_scene_types.h
View File

@@ -1097,18 +1097,18 @@ typedef struct GP_Sculpt_Settings {
/** Runtime. */ /** Runtime. */
void *paintcursor; void *paintcursor;
/** EGP_Sculpt_Types (sculpt). */ /** #eGP_Sculpt_Types (sculpt). */
int brushtype; int brushtype;
/** EGP_Sculpt_SettingsFlag. */ /** #eGP_Sculpt_SettingsFlag. */
int flag; int flag;
/** EGP_Lockaxis_Types lock drawing to one axis. */ /** #eGP_Lockaxis_Types lock drawing to one axis. */
int lock_axis; int lock_axis;
char pad1[4]; char pad1[4];
/* weight paint is a submode of sculpt but use its own index. All weight paint /* weight paint is a submode of sculpt but use its own index. All weight paint
* brushes must be defined at the end of the brush array. * brushes must be defined at the end of the brush array.
*/ */
/** EGP_Sculpt_Types (weight paint). */ /** #eGP_Sculpt_Types (weight paint). */
int weighttype; int weighttype;
char pad[4]; char pad[4];
/** Multiframe edit falloff effect by frame. */ /** Multiframe edit falloff effect by frame. */
@@ -1139,12 +1139,12 @@ typedef enum eGP_Sculpt_SettingsFlag {
/* Settings for GP Interpolation Operators */ /* Settings for GP Interpolation Operators */
typedef struct GP_Interpolate_Settings { typedef struct GP_Interpolate_Settings {
/** EGP_Interpolate_SettingsFlag. */ /** #eGP_Interpolate_SettingsFlag. */
short flag; short flag;
/** EGP_Interpolate_Type - Interpolation Mode. */ /** #eGP_Interpolate_Type - Interpolation Mode. */
char type; char type;
/** EBezTriple_Easing - Easing mode (if easing equation used). */ /** #eBezTriple_Easing - Easing mode (if easing equation used). */
char easing; char easing;
/** BEZT_IPO_BACK. */ /** BEZT_IPO_BACK. */

18
source/blender/makesdna/DNA_screen_types.h
View File

@@ -337,7 +337,7 @@ typedef struct ScrArea {
* It's been there for ages, name doesn't fit any more. * It's been there for ages, name doesn't fit any more.
*/ */
char spacetype; char spacetype;
/** ESpace_Type (SPACE_FOO). */ /** #eSpace_Type (SPACE_FOO). */
char butspacetype; char butspacetype;
short butspacetype_subtype; short butspacetype_subtype;
@@ -366,17 +366,17 @@ typedef struct ScrArea {
* changing the editor type, we try to reuse old editor data from this list. * changing the editor type, we try to reuse old editor data from this list.
* The first item is the active/visible one. * The first item is the active/visible one.
*/ */
/** SpaceLink. */ /** #SpaceLink. */
ListBase spacedata; ListBase spacedata;
/* NOTE: This region list is the one from the active/visible editor (first item in /* NOTE: This region list is the one from the active/visible editor (first item in
* spacedata list). Use SpaceLink.regionbase if it's inactive (but only then)! * spacedata list). Use SpaceLink.regionbase if it's inactive (but only then)!
*/ */
/** ARegion. */ /** #ARegion. */
ListBase regionbase; ListBase regionbase;
/** WmEventHandler. */ /** #wmEventHandler. */
ListBase handlers; ListBase handlers;
/** AZone. */ /** #AZone. */
ListBase actionzones; ListBase actionzones;
ScrArea_Runtime runtime; ScrArea_Runtime runtime;
@@ -427,17 +427,17 @@ typedef struct ARegion {
/** Callbacks for this region type. */ /** Callbacks for this region type. */
struct ARegionType *type; struct ARegionType *type;
/** UiBlock. */ /** #uiBlock. */
ListBase uiblocks; ListBase uiblocks;
/** Panel. */ /** Panel. */
ListBase panels; ListBase panels;
/** Stack of panel categories. */ /** Stack of panel categories. */
ListBase panels_category_active; ListBase panels_category_active;
/** UiList. */ /** #uiList. */
ListBase ui_lists; ListBase ui_lists;
/** UiPreview. */ /** #uiPreview. */
ListBase ui_previews; ListBase ui_previews;
/** WmEventHandler. */ /** #wmEventHandler. */
ListBase handlers; ListBase handlers;
/** Panel categories runtime. */ /** Panel categories runtime. */
ListBase panels_category; ListBase panels_category;

2
source/blender/makesdna/DNA_space_types.h
View File

@@ -905,7 +905,7 @@ typedef struct FileDirEntry {
/* Either point to active variant/revision if available, or own entry (in mere filebrowser case). */ /* Either point to active variant/revision if available, or own entry (in mere filebrowser case). */
FileDirEntryRevision *entry; FileDirEntryRevision *entry;
/** EFileSel_File_Types. */ /** #eFileSel_File_Types. */
int typeflag; int typeflag;
/** ID type, in case typeflag has FILE_TYPE_BLENDERLIB set. */ /** ID type, in case typeflag has FILE_TYPE_BLENDERLIB set. */
int blentype; int blentype;

14
source/blender/makesdna/DNA_userdef_types.h
View File

@@ -427,7 +427,7 @@ typedef struct ThemeWireColor {
char select[4]; char select[4];
char active[4]; char active[4];
/** EWireColor_Flags. */ /** #eWireColor_Flags. */
short flag; short flag;
short pad; short pad;
} ThemeWireColor; } ThemeWireColor;
@@ -559,9 +559,9 @@ typedef struct UserDef {
/* UserDef has separate do-version handling, and can be read from other files */ /* UserDef has separate do-version handling, and can be read from other files */
int versionfile, subversionfile; int versionfile, subversionfile;
/** EUserPref_Flag. */ /** #eUserPref_Flag. */
int flag; int flag;
/** EDupli_ID_Flags. */ /** #eDupli_ID_Flags. */
int dupflag; int dupflag;
int savetime; int savetime;
/** FILE_MAXDIR length. */ /** FILE_MAXDIR length. */
@@ -584,7 +584,7 @@ typedef struct UserDef {
/** Minimum spacing between gridlines in View2D grids. */ /** Minimum spacing between gridlines in View2D grids. */
short v2d_min_gridsize; short v2d_min_gridsize;
/** ETimecodeStyles, style of timecode display. */ /** #eTimecodeStyles, style of timecode display. */
short timecode_style; short timecode_style;
short versions; short versions;
@@ -592,9 +592,9 @@ typedef struct UserDef {
short pad; short pad;
short wheellinescroll; short wheellinescroll;
/** EUserpref_UI_Flag. */ /** #eUserpref_UI_Flag. */
int uiflag; int uiflag;
/** EUserpref_UI_Flag2. */ /** #eUserpref_UI_Flag2. */
int uiflag2; int uiflag2;
/* Experimental flag for app-templates to make changes to behavior /* Experimental flag for app-templates to make changes to behavior
* which are outside the scope of typical preferences. */ * which are outside the scope of typical preferences. */
@@ -628,7 +628,7 @@ typedef struct UserDef {
/** Node insert offset (aka auto-offset) margin, but might be useful for later stuff as well. */ /** Node insert offset (aka auto-offset) margin, but might be useful for later stuff as well. */
char node_margin; char node_margin;
char pad2[5]; char pad2[5];
/** EUserpref_Translation_Flags. */ /** #eUserpref_Translation_Flags. */
short transopts; short transopts;
short menuthreshold1, menuthreshold2; short menuthreshold1, menuthreshold2;

2
source/blender/makesdna/DNA_workspace_types.h
View File

@@ -135,7 +135,7 @@ typedef struct WorkSpace {
ListBase hook_layout_relations DNA_PRIVATE_WORKSPACE_READ_WRITE; ListBase hook_layout_relations DNA_PRIVATE_WORKSPACE_READ_WRITE;
/* Feature tagging (use for addons) */ /* Feature tagging (use for addons) */
/** WmOwnerID. */ /** #wmOwnerID. */
ListBase owner_ids DNA_PRIVATE_WORKSPACE_READ_WRITE; ListBase owner_ids DNA_PRIVATE_WORKSPACE_READ_WRITE;
/* should be: '#ifdef USE_WORKSPACE_TOOL'. */ /* should be: '#ifdef USE_WORKSPACE_TOOL'. */