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:
authorCampbell Barton <ideasman42@gmail.com>2019-01-07 14:19:13 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-01-07 16:43:00 +0300
commit5a43406e1bad973a8cb32702b4fdb588068a6dcd (patch)
treeb47ac75f429b586950dab5300669c373023efab8 /source/blender/makesdna/DNA_nla_types.h
parent0215caeac2ad013fa03e2799049f5358d951ebfa (diff)
Cleanup: move DNA comments before struct members
Needed for clang-format in some cases, see: T53211
Diffstat (limited to 'source/blender/makesdna/DNA_nla_types.h')
-rw-r--r--source/blender/makesdna/DNA_nla_types.h59
1 files changed, 38 insertions, 21 deletions
diff --git a/source/blender/makesdna/DNA_nla_types.h b/source/blender/makesdna/DNA_nla_types.h
index 72db244c1fe..a10504e6b3e 100644
--- a/source/blender/makesdna/DNA_nla_types.h
+++ b/source/blender/makesdna/DNA_nla_types.h
@@ -60,25 +60,40 @@ typedef struct bActionModifier {
typedef struct bActionStrip {
struct bActionStrip *next, *prev;
short flag, mode;
- short stride_axis; /* axis 0=x, 1=y, 2=z */
- short curmod; /* current modifier for buttons */
-
- struct Ipo *ipo; /* Blending ipo - was used for some old NAN era experiments. Non-functional currently. */
- struct bAction *act; /* The action referenced by this strip */
- struct Object *object; /* For groups, the actual object being nla'ed */
- float start, end; /* The range of frames covered by this strip */
- float actstart, actend; /* The range of frames taken from the action */
- float actoffs; /* Offset within action, for cycles and striding */
- float stridelen; /* The stridelength (considered when flag & ACT_USESTRIDE) */
- float repeat; /* The number of times to repeat the action range */
- float scale; /* The amount the action range is scaled by */
-
- float blendin, blendout; /* The number of frames on either end of the strip's length to fade in/out */
-
- char stridechannel[32]; /* Instead of stridelen, it uses an action channel */
- char offs_bone[32]; /* if repeat, use this bone/channel for defining offset */
-
- ListBase modifiers; /* modifier stack */
+ /** Axis 0=x, 1=y, 2=z. */
+ short stride_axis;
+ /** Current modifier for buttons. */
+ short curmod;
+
+ /** Blending ipo - was used for some old NAN era experiments. Non-functional currently. */
+ struct Ipo *ipo;
+ /** The action referenced by this strip. */
+ struct bAction *act;
+ /** For groups, the actual object being nla'ed. */
+ struct Object *object;
+ /** The range of frames covered by this strip. */
+ float start, end;
+ /** The range of frames taken from the action. */
+ float actstart, actend;
+ /** Offset within action, for cycles and striding. */
+ float actoffs;
+ /** The stridelength (considered when flag & ACT_USESTRIDE). */
+ float stridelen;
+ /** The number of times to repeat the action range. */
+ float repeat;
+ /** The amount the action range is scaled by. */
+ float scale;
+
+ /** The number of frames on either end of the strip's length to fade in/out. */
+ float blendin, blendout;
+
+ /** Instead of stridelen, it uses an action channel. */
+ char stridechannel[32];
+ /** If repeat, use this bone/channel for defining offset. */
+ char offs_bone[32];
+
+ /** Modifier stack. */
+ ListBase modifiers;
} bActionStrip;
/* strip->mode (these defines aren't really used, but are here for reference) */
@@ -89,12 +104,14 @@ typedef struct bActionStrip {
typedef enum eActStrip_Flag {
ACTSTRIP_SELECT = (1<<0),
ACTSTRIP_USESTRIDE = (1<<1),
- ACTSTRIP_BLENDTONEXT = (1<<2), /* Not implemented. Is not used anywhere */
+ /* Not implemented. Is not used anywhere */
+ ACTSTRIP_BLENDTONEXT = (1<<2),
ACTSTRIP_HOLDLASTFRAME = (1<<3),
ACTSTRIP_ACTIVE = (1<<4),
ACTSTRIP_LOCK_ACTION = (1<<5),
ACTSTRIP_MUTE = (1<<6),
- ACTSTRIP_REVERSE = (1<<7), /* This has yet to be implemented. To indicate that a strip should be played backwards */
+ /* This has yet to be implemented. To indicate that a strip should be played backwards */
+ ACTSTRIP_REVERSE = (1<<7),
ACTSTRIP_CYCLIC_USEX = (1<<8),
ACTSTRIP_CYCLIC_USEY = (1<<9),
ACTSTRIP_CYCLIC_USEZ = (1<<10),