[Bf-blender-cvs] [299ff7dcd13] master: Cleanup: corrections to last commit
Campbell Barton
noreply at git.blender.org
Mon Jan 7 15:01:15 CET 2019
Commit: 299ff7dcd1383f5141f5eba3c04c447d5072f705
Author: Campbell Barton
Date: Tue Jan 8 01:00:40 2019 +1100
Branches: master
https://developer.blender.org/rB299ff7dcd1383f5141f5eba3c04c447d5072f705
Cleanup: corrections to last commit
===================================================================
M source/blender/makesdna/DNA_action_types.h
M source/blender/makesdna/DNA_anim_types.h
M source/blender/makesdna/DNA_cloth_types.h
M source/blender/makesdna/DNA_constraint_types.h
M source/blender/makesdna/DNA_gpu_types.h
M source/blender/makesdna/DNA_modifier_types.h
M source/blender/makesdna/DNA_movieclip_types.h
M source/blender/makesdna/DNA_object_force_types.h
M source/blender/makesdna/DNA_scene_types.h
M source/blender/makesdna/DNA_screen_types.h
M source/blender/makesdna/DNA_space_types.h
M source/blender/makesdna/DNA_userdef_types.h
M source/blender/makesdna/DNA_workspace_types.h
===================================================================
diff --git a/source/blender/makesdna/DNA_action_types.h b/source/blender/makesdna/DNA_action_types.h
index d257874544d..b870a027e5c 100644
--- a/source/blender/makesdna/DNA_action_types.h
+++ b/source/blender/makesdna/DNA_action_types.h
@@ -120,27 +120,27 @@ typedef struct bAnimVizSettings {
/** Number of frames befo.re/after current frame to show */
int ghost_bc, ghost_ac;
- /** EOnionSkin_Types. */
+ /** #eOnionSkin_Types. */
short ghost_type;
/** Number of frames between each ghost shown (not for GHOST_TYPE_KEYS). */
short ghost_step;
- /** EOnionSkin_Flag. */
+ /** #eOnionSkin_Flag. */
short ghost_flag;
/* General Settings ------------------------ */
- /** EAnimViz_RecalcFlags. */
+ /** #eAnimViz_RecalcFlags. */
short recalc;
/* Motion Path Settings ------------------- */
- /** EMotionPath_Types. */
+ /** #eMotionPath_Types. */
short path_type;
/** Number of frames between points indicated on the paths. */
short path_step;
- /** EMotionPaths_ViewFlag. */
+ /** #eMotionPaths_ViewFlag. */
short path_viewflag;
- /** EMotionPaths_BakeFlag. */
+ /** #eMotionPaths_BakeFlag. */
short path_bakeflag;
/** Start and end frames of path-calculation range. */
@@ -313,7 +313,7 @@ typedef struct bPoseChannel {
float quat[4];
/** Axis-angle rotation. */
float rotAxis[3], rotAngle;
- /** ERotationModes - rotation representation to use. */
+ /** #eRotationModes - rotation representation to use. */
short rotmode;
short pad;
diff --git a/source/blender/makesdna/DNA_anim_types.h b/source/blender/makesdna/DNA_anim_types.h
index 13358ce7bc8..8e89f4a42b7 100644
--- a/source/blender/makesdna/DNA_anim_types.h
+++ b/source/blender/makesdna/DNA_anim_types.h
@@ -167,9 +167,9 @@ typedef struct FMod_FunctionGenerator {
float value_offset;
/* flags */
- /** EFMod_Generator_Functions. */
+ /** #eFMod_Generator_Functions. */
int type;
- /** EFMod_Generator_flags. */
+ /** #eFMod_Generator_flags. */
int flag;
} FMod_FunctionGenerator;
diff --git a/source/blender/makesdna/DNA_cloth_types.h b/source/blender/makesdna/DNA_cloth_types.h
index 1f863689ba6..18c1f67513b 100644
--- a/source/blender/makesdna/DNA_cloth_types.h
+++ b/source/blender/makesdna/DNA_cloth_types.h
@@ -53,19 +53,19 @@ typedef struct ClothSimSettings {
float mingoal;
/** Mechanical damping of springs. */
float Cdis DNA_DEPRECATED;
- /** Viscous/fluid damping. . */
+ /** Viscous/fluid damping. */
float Cvi;
- /** Gravity/external force vector. . */
+ /** Gravity/external force vector. */
float gravity[3];
/** This is the duration of our time step, computed.. */
float dt;
- /** The mass of the entire cloth. . */
+ /** The mass of the entire cloth. */
float mass;
/** Structural spring stiffness. */
float structural DNA_DEPRECATED;
- /** Shear spring stiffness. . */
+ /** Shear spring stiffness. */
float shear;
- /** Flexion spring stiffness. . */
+ /** Flexion spring stiffness. */
float bending;
/** Max bending scaling value, min is "bending". */
float max_bend;
@@ -115,15 +115,15 @@ typedef struct ClothSimSettings {
float voxel_cell_size;
int pad;
- /** Number of time steps per frame. . */
+ /** Number of time steps per frame. */
int stepsPerFrame;
- /** Flags, see CSIMSETT_FLAGS enum above.. */
+ /** Flags, see CSIMSETT_FLAGS enum above. */
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;
/** In percent!; if tearing enabled, a spring will get cut. */
int maxspringlen;
- /** Which solver should be used? txold. */
+ /** Which solver should be used? txold. */
short solver_type;
/** Vertex group for scaling bending stiffness. */
short vgroup_bend;
@@ -161,13 +161,13 @@ typedef struct ClothSimSettings {
typedef struct ClothCollSettings {
/** E.g. pointer to temp memory for collisions. */
struct LinkNode *collision_list;
- /** Min distance for collisions. . */
+ /** Min distance for collisions. */
float epsilon;
/** Fiction/damping with self contact. */
float self_friction;
- /** Friction/damping applied on contact with other object..*/
+ /** Friction/damping applied on contact with other object. */
float friction;
- /** Collision restitution on contact with other object..*/
+ /** Collision restitution on contact with other object. */
float damping;
/** For selfcollision. */
float selfepsilon;
@@ -177,7 +177,7 @@ typedef struct ClothCollSettings {
int flags;
/** How many iterations for the selfcollision loop. */
short self_loop_count DNA_DEPRECATED;
- /** How many iterations for the collision loop. . */
+ /** How many iterations for the collision loop. */
short loop_count;
int pad;
/** Only use colliders from this group of objects. */
diff --git a/source/blender/makesdna/DNA_constraint_types.h b/source/blender/makesdna/DNA_constraint_types.h
index 3932d2caf85..e27f810b38b 100644
--- a/source/blender/makesdna/DNA_constraint_types.h
+++ b/source/blender/makesdna/DNA_constraint_types.h
@@ -485,11 +485,11 @@ typedef struct bPivotConstraint {
/* Rotation-driven activation:
* 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;
/* General flags */
- /** EPivotConstraint_Flag. */
+ /** #ePivotConstraint_Flag. */
short flag;
} bPivotConstraint;
diff --git a/source/blender/makesdna/DNA_gpu_types.h b/source/blender/makesdna/DNA_gpu_types.h
index 050db939671..8f0c1b8cd37 100644
--- a/source/blender/makesdna/DNA_gpu_types.h
+++ b/source/blender/makesdna/DNA_gpu_types.h
@@ -59,7 +59,7 @@ typedef struct GPUSSAOSettings {
typedef struct GPUFXSettings {
GPUDOFSettings *dof;
GPUSSAOSettings *ssao;
- /** EGPUFXFlags. */
+ /** #eGPUFXFlags. */
char fx_flag;
char pad[7];
} GPUFXSettings;
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h
index 1cd4c4e2908..8384d49033a 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -1439,7 +1439,7 @@ typedef struct DynamicPaintModifierData {
struct DynamicPaintCanvasSettings *canvas;
struct DynamicPaintBrushSettings *brush;
- /** Ui display: canvas / brush. */
+ /** UI display: canvas / brush. */
int type;
int pad;
} DynamicPaintModifierData;
diff --git a/source/blender/makesdna/DNA_movieclip_types.h b/source/blender/makesdna/DNA_movieclip_types.h
index 9032be7e54b..58041284d84 100644
--- a/source/blender/makesdna/DNA_movieclip_types.h
+++ b/source/blender/makesdna/DNA_movieclip_types.h
@@ -137,7 +137,7 @@ typedef struct MovieClipScopes {
struct MovieTrackingMarker undist_marker;
/** Search area of a track. */
struct ImBuf *track_search;
- /** ImBuf displayed in track preview. */
+ /** #ImBuf displayed in track preview. */
struct ImBuf *track_preview;
/** Sub-pizel position of marker in track ImBuf. */
float track_pos[2];
diff --git a/source/blender/makesdna/DNA_object_force_types.h b/source/blender/makesdna/DNA_object_force_types.h
index 6da07f9b214..ef62d60dd45 100644
--- a/source/blender/makesdna/DNA_object_force_types.h
+++ b/source/blender/makesdna/DNA_object_force_types.h
@@ -55,35 +55,36 @@ typedef enum ePFieldType {
PFIELD_BOID = 10, /* Defines predator / goal for boids */
PFIELD_TURBULENCE = 11, /* Force defined by BLI_gTurbulence */
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
} ePFieldType;
typedef struct PartDeflect {
- /** General settings flag . */
+ /** General settings flag. */
int flag;
- /** Deflection flag - does mesh deflect particles . */
+ /** Deflection flag - does mesh deflect particles. */
short deflect;
- /** Force field type, do the vertices attract / repel particles?. */
+ /** Force field type, do the vertices attract / repel particles? */
short forcefield;
- /** Fall-off type . */
+ /** Fall-off type. */
short falloff;
- /** Point, plane or surface . */
+ /** Point, plane or surface. */
short shape;
- /** Texture effector . */
+ /** Texture effector. */
short tex_mode;
- /** For curve guide . */
+ /** For curve guide. */
short kink, kink_axis;
short zdir;
/* Main effector values */
- /** The strength of the force (+ or - ) . */
+ /** The strength of the force (+ or - ). */
float f_strength;
- /** Damping ratio of the harmonic effector. . */
+ /** Damping ratio of the harmonic effector. */
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;
- /* force used as the velocity of surrounding medium. */
/** Noise size for noise effector, restlength for harmonic effector. */
float f_size;
@@ -91,35 +92,35 @@ typedef struct PartDeflect {
/* fall-off */
/** The power law - real gravitation is 2 (square). */
float f_power;
- /** If indicated, use this maximum . */
+ /** If indicated, use this maximum. */
float maxdist;
- /** If indicated, use this minimum . */
+ /** If indicated, use this minimum. */
float mindist;
- /** Radial fall-off power . */
+ /** Radial fall-off power. */
float f_power_r;
- /** Radial versions of above . */
+ /** Radial versions of above. */
float maxrad;
float minrad;
/* particle collisions */
- /** Damping factor for particle deflection . */
+ /** Damping factor for particle deflection. */
float pdef_damp;
- /** Random element of damping for deflection . */
+ /** Random element of damping for deflection. */
float pdef_rdamp;
- /** Chance of particle passing through mesh . */
+ /** Chance of particle passing through mesh. */
float pdef_perm;
- /** Friction factor for particle deflection . */
+ /** Friction factor for particle deflection. */
f
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list