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
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r--source/blender/makesdna/DNA_action_types.h2
-rw-r--r--source/blender/makesdna/DNA_anim_types.h8
-rw-r--r--source/blender/makesdna/DNA_constraint_types.h46
-rw-r--r--source/blender/makesdna/DNA_gpencil_types.h16
-rw-r--r--source/blender/makesdna/intern/makesdna.c8
5 files changed, 40 insertions, 40 deletions
diff --git a/source/blender/makesdna/DNA_action_types.h b/source/blender/makesdna/DNA_action_types.h
index 7d4ac170489..44c9e52cd8e 100644
--- a/source/blender/makesdna/DNA_action_types.h
+++ b/source/blender/makesdna/DNA_action_types.h
@@ -68,7 +68,7 @@ typedef enum eMotionPathVert_Flag {
/* ........ */
/* Motion Path data cache (mpath)
- * - for elements providing transforms (i.e. Objects or PoseChannels)
+ * - for elements providing transforms (i.e. Objects or PoseChannels)
*/
typedef struct bMotionPath {
bMotionPathVert *points; /* path samples */
diff --git a/source/blender/makesdna/DNA_anim_types.h b/source/blender/makesdna/DNA_anim_types.h
index 515e84c917d..2d1cbdc490d 100644
--- a/source/blender/makesdna/DNA_anim_types.h
+++ b/source/blender/makesdna/DNA_anim_types.h
@@ -125,7 +125,7 @@ typedef enum eFMod_Generator_Modes {
/* generator flags
- * - shared by Generator and Function Generator
+ * - shared by Generator and Function Generator
*/
typedef enum eFMod_Generator_Flags {
/* generator works in conjunction with other modifiers (i.e. doesn't replace those before it) */
@@ -136,7 +136,7 @@ typedef enum eFMod_Generator_Flags {
/* 'Built-In Function' Generator modifier data
*
* This uses the general equation for equations:
- * y = amplitude * fn(phase_multiplier*x + phase_offset) + y_offset
+ * y = amplitude * fn(phase_multiplier*x + phase_offset) + y_offset
*
* where amplitude, phase_multiplier/offset, y_offset are user-defined coefficients,
* x is the evaluation 'time', and 'y' is the resultant value
@@ -353,7 +353,7 @@ typedef enum eDriverVar_Types {
/* maximum number of variable types
* NOTE: this must always be th last item in this list,
- * so add new types above this line
+ * so add new types above this line.
*/
MAX_DVAR_TYPES
} eDriverVar_Types;
@@ -759,7 +759,7 @@ typedef enum eKSP_Grouping {
/* path should be grouped using KeyingSet's name */
KSP_GROUP_KSNAME,
/* path should be grouped using name of inner-most context item from templates
- * - this is most useful for relative KeyingSets only
+ * - this is most useful for relative KeyingSets only
*/
KSP_GROUP_TEMPLATE_ITEM
} eKSP_Grouping;
diff --git a/source/blender/makesdna/DNA_constraint_types.h b/source/blender/makesdna/DNA_constraint_types.h
index 15555a2bd50..a2c756dd197 100644
--- a/source/blender/makesdna/DNA_constraint_types.h
+++ b/source/blender/makesdna/DNA_constraint_types.h
@@ -54,19 +54,19 @@ typedef struct bConstraintChannel {
typedef struct bConstraint {
struct bConstraint *next, *prev;
- void *data; /* Constraint data (a valid constraint type) */
- short type; /* Constraint type */
- short flag; /* Flag - General Settings */
+ 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 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 */
+ 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*/
+ 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 */
@@ -105,10 +105,10 @@ typedef enum eConstraintTargetFlag {
/* bConstraintTarget/bConstraintOb -> type */
typedef enum eConstraintObType {
- CONSTRAINT_OBTYPE_OBJECT = 1, /* string is "" */
- CONSTRAINT_OBTYPE_BONE = 2, /* string is bone-name */
- CONSTRAINT_OBTYPE_VERT = 3, /* string is vertex-group name */
- CONSTRAINT_OBTYPE_CV = 4 /* string is vertex-group name - is not available until curves get vgroups */
+ CONSTRAINT_OBTYPE_OBJECT = 1, /* string is "" */
+ CONSTRAINT_OBTYPE_BONE = 2, /* string is bone-name */
+ CONSTRAINT_OBTYPE_VERT = 3, /* string is vertex-group name */
+ CONSTRAINT_OBTYPE_CV = 4 /* string is vertex-group name - is not available until curves get vgroups */
} eConstraintObType;
@@ -354,33 +354,33 @@ typedef struct bTransformConstraint {
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 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 */
float to_max[3];
- float from_min_rot[3]; /* from_min/max defines range of target transform */
- float from_max_rot[3]; /* to map on to to_min/max range. */
+ float from_min_rot[3]; /* from_min/max defines range of target transform */
+ float from_max_rot[3]; /* to map on to to_min/max range. */
float to_min_rot[3]; /* range of motion on owner caused by target */
float to_max_rot[3];
- float from_min_scale[3]; /* from_min/max defines range of target transform */
- float from_max_scale[3]; /* to map on to to_min/max range. */
- float to_min_scale[3]; /* range of motion on owner caused by target */
+ float from_min_scale[3]; /* from_min/max defines range of target transform */
+ float from_max_scale[3]; /* to map on to to_min/max range. */
+ float to_min_scale[3]; /* range of motion on owner caused by target */
float to_max_scale[3];
} bTransformConstraint;
/* Pivot Constraint */
typedef struct bPivotConstraint {
/* Pivot Point:
- * Either target object + offset, or just offset is used
+ * Either target object + offset, or just offset is used
*/
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
+ * This option provides easier one-stop setups for footrolls
*/
short rotAxis; /* rotation axes to consider for this (ePivotConstraint_Axis) */
@@ -479,8 +479,8 @@ typedef struct bTransformCacheConstraint {
/* ------------------------------------------ */
/* bConstraint->type
- * - Do not ever change the order of these, or else files could get
- * broken as their correct value cannot be resolved
+ * - Do not ever change the order of these, or else files could get
+ * broken as their correct value cannot be resolved
*/
typedef enum eBConstraint_Types {
CONSTRAINT_TYPE_NULL = 0, /* Invalid/legacy constraint */
diff --git a/source/blender/makesdna/DNA_gpencil_types.h b/source/blender/makesdna/DNA_gpencil_types.h
index fcaf8b00cde..503ad2f28d9 100644
--- a/source/blender/makesdna/DNA_gpencil_types.h
+++ b/source/blender/makesdna/DNA_gpencil_types.h
@@ -49,9 +49,9 @@ struct MDeformVert;
/* GP Stroke Points */
/* Grease-Pencil Annotations - 'Stroke Point'
- * -> Coordinates may either be 2d or 3d depending on settings at the time
- * -> Coordinates of point on stroke, in proportions of window size
- * This assumes that the bottom-left corner is (0,0)
+ * -> Coordinates may either be 2d or 3d depending on settings at the time
+ * -> Coordinates of point on stroke, in proportions of window size
+ * This assumes that the bottom-left corner is (0,0)
*/
typedef struct bGPDspoint {
float x, y, z; /* co-ordinates of point (usually 2d, but can be 3d as well) */
@@ -79,8 +79,8 @@ typedef enum eGPDspoint_Flag {
/* GP Fill - Triangle Tessellation Data */
/* Grease-Pencil Annotations - 'Triangle'
- * -> A triangle contains the index of three vertices for filling the stroke
- * This is only used if high quality fill is enabled
+ * -> A triangle contains the index of three vertices for filling the stroke
+ * This is only used if high quality fill is enabled
*/
typedef struct bGPDtriangle {
/* indices for tessellated triangle used for GP Fill */
@@ -152,8 +152,8 @@ typedef struct bGPDstroke_Runtime {
} bGPDstroke_Runtime;
/* Grease-Pencil Annotations - 'Stroke'
- * -> A stroke represents a (simplified version) of the curve
- * drawn by the user in one 'mousedown'->'mouseup' operation
+ * -> A stroke represents a (simplified version) of the curve
+ * drawn by the user in one 'mousedown'->'mouseup' operation
*/
typedef struct bGPDstroke {
struct bGPDstroke *next, *prev;
@@ -208,7 +208,7 @@ typedef struct bGPDframe_Runtime {
} bGPDframe_Runtime;
/* Grease-Pencil Annotations - 'Frame'
- * -> Acts as storage for the 'image' formed by strokes
+ * -> Acts as storage for the 'image' formed by strokes
*/
typedef struct bGPDframe {
struct bGPDframe *next, *prev;
diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c
index e1cdc8f5983..1905b69ebc5 100644
--- a/source/blender/makesdna/intern/makesdna.c
+++ b/source/blender/makesdna/intern/makesdna.c
@@ -154,10 +154,10 @@ static short **structs, *structdata; /* at sp = structs[a] is the first address
/**
* Variable to control debug output of makesdna.
* debugSDNA:
- * - 0 = no output, except errors
- * - 1 = detail actions
- * - 2 = full trace, tell which names and types were found
- * - 4 = full trace, plus all gritty details
+ * - 0 = no output, except errors
+ * - 1 = detail actions
+ * - 2 = full trace, tell which names and types were found
+ * - 4 = full trace, plus all gritty details
*/
static int debugSDNA = 0;
static int additional_slen_offset;