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-04-17 07:17:24 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-04-17 07:21:24 +0300
commite12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch)
tree8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/makesdna/DNA_nla_types.h
parentb3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff)
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'source/blender/makesdna/DNA_nla_types.h')
-rw-r--r--source/blender/makesdna/DNA_nla_types.h126
1 files changed, 63 insertions, 63 deletions
diff --git a/source/blender/makesdna/DNA_nla_types.h b/source/blender/makesdna/DNA_nla_types.h
index 4095a5dc99b..f634e7af5d0 100644
--- a/source/blender/makesdna/DNA_nla_types.h
+++ b/source/blender/makesdna/DNA_nla_types.h
@@ -32,82 +32,82 @@ struct bAction;
/* simple uniform modifier structure, assumed it can hold all type info */
typedef struct bActionModifier {
- struct bActionModifier *next, *prev;
- short type, flag;
- char channel[32];
+ struct bActionModifier *next, *prev;
+ short type, flag;
+ char channel[32];
- /* noise modifier */
- float noisesize, turbul;
- short channels;
+ /* noise modifier */
+ float noisesize, turbul;
+ short channels;
- /* path deform modifier */
- short no_rot_axis;
- struct Object *ob;
+ /* path deform modifier */
+ short no_rot_axis;
+ struct Object *ob;
} bActionModifier;
/* NLA-Modifier Types (UNUSED) */
-// #define ACTSTRIP_MOD_DEFORM 0
-// #define ACTSTRIP_MOD_NOISE 1
+// #define ACTSTRIP_MOD_DEFORM 0
+// #define ACTSTRIP_MOD_NOISE 1
typedef struct bActionStrip {
- struct bActionStrip *next, *prev;
- short flag, mode;
- /** 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;
+ struct bActionStrip *next, *prev;
+ short flag, mode;
+ /** 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) */
-#define ACTSTRIPMODE_BLEND 0
-#define ACTSTRIPMODE_ADD 1
+#define ACTSTRIPMODE_BLEND 0
+#define ACTSTRIPMODE_ADD 1
/* strip->flag */
typedef enum eActStrip_Flag {
- ACTSTRIP_SELECT = (1 << 0),
- ACTSTRIP_USESTRIDE = (1 << 1),
- /* 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),
- /* 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),
- ACTSTRIP_AUTO_BLENDS = (1 << 11),
+ ACTSTRIP_SELECT = (1 << 0),
+ ACTSTRIP_USESTRIDE = (1 << 1),
+ /* 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),
+ /* 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),
+ ACTSTRIP_AUTO_BLENDS = (1 << 11),
} eActStrip_Flag;
#endif