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:
authorMitchell Stokes <mogurijin@gmail.com>2011-07-03 05:59:17 +0400
committerMitchell Stokes <mogurijin@gmail.com>2011-07-03 05:59:17 +0400
commit5f4f75c51a511f4f190c16eedfc4c04c3b9aa387 (patch)
tree9c226d26639fdeb1c4b546183f4178979e7b93cb /source/gameengine/Converter/BL_ActionActuator.h
parent8c3f2923fdc0626d4c2e7f6307c1ec4fd0e8c7f3 (diff)
BGE Animations: Adding in layer weights to allow for layer blending.
Diffstat (limited to 'source/gameengine/Converter/BL_ActionActuator.h')
-rw-r--r--source/gameengine/Converter/BL_ActionActuator.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/source/gameengine/Converter/BL_ActionActuator.h b/source/gameengine/Converter/BL_ActionActuator.h
index 96b9b5e2551..3004aa2e6ca 100644
--- a/source/gameengine/Converter/BL_ActionActuator.h
+++ b/source/gameengine/Converter/BL_ActionActuator.h
@@ -53,6 +53,7 @@ public:
short blendin,
short priority,
short layer,
+ float layer_weight,
short ipo_flags,
short end_reset,
float stride)
@@ -72,6 +73,7 @@ public:
m_playtype(playtype),
m_priority(priority),
m_layer(layer),
+ m_layer_weight(layer_weight),
m_ipo_flags(ipo_flags),
m_end_reset(end_reset),
m_is_going(false),
@@ -165,6 +167,7 @@ protected:
float m_blendin;
float m_blendstart;
float m_stridelength;
+ float m_layer_weight;
short m_playtype;
short m_priority;
short m_layer;