diff options
| author | Mitchell Stokes <mogurijin@gmail.com> | 2013-08-15 03:32:00 +0400 |
|---|---|---|
| committer | Mitchell Stokes <mogurijin@gmail.com> | 2013-08-15 03:32:00 +0400 |
| commit | 196d30e0046088820e240642e318e051e2e69fbc (patch) | |
| tree | 698f2542102463723ac4d8958b9b7b23fdfea46d /source/blender/makesdna/DNA_actuator_types.h | |
| parent | 9afae77fedb8a84f4d305ebce81b0cc509a2183b (diff) | |
BGE: The Action Actuator can now make use of additive blending.
Diffstat (limited to 'source/blender/makesdna/DNA_actuator_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_actuator_types.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_actuator_types.h b/source/blender/makesdna/DNA_actuator_types.h index 1495ba1b1a5..f4e2ff43fc5 100644 --- a/source/blender/makesdna/DNA_actuator_types.h +++ b/source/blender/makesdna/DNA_actuator_types.h @@ -59,7 +59,7 @@ typedef struct bActionActuator { short layer; /* Animation layer */ short end_reset; /* Ending the actuator (negative pulse) wont reset the the action to its starting frame */ short strideaxis; /* Displacement axis */ - short pad; + short blend_mode; /* Layer blending mode */ float stridelength; /* Displacement incurred by cycle */ // not in use float layer_weight; /* How much of the previous layer to use for blending. (<0 = disable, 0 = add mode) */ } bActionActuator; @@ -341,6 +341,10 @@ typedef struct bActuator { #define ACT_ACTION_FROM_PROP 6 #define ACT_ACTION_MOTION 7 +/* actionactuator->blend_mode */ +#define ACT_ACTION_BLEND 0 +#define ACT_ACTION_ADD 1 + /* ipoactuator->type */ #define ACT_IPO_PLAY 0 #define ACT_IPO_PINGPONG 1 |