diff options
| author | Mitchell Stokes <mogurijin@gmail.com> | 2011-08-29 10:19:55 +0400 |
|---|---|---|
| committer | Mitchell Stokes <mogurijin@gmail.com> | 2011-08-29 10:19:55 +0400 |
| commit | 296cc41b03b18fbe65357aa0cfdf43f43c881922 (patch) | |
| tree | 0a39b8e7c93ca1b96b0c720205a146bcfe1c0bfb /source/gameengine/Converter/BL_ArmatureObject.cpp | |
| parent | ca79dee61f11227be0ed4cc5b1241fa748124da0 (diff) | |
BGE Animations: Various changes to make code reviewers happy:
* Naming/style changes
* Taking advantage of switch statements
* Removing unneeded NULL checks
* etc
Diffstat (limited to 'source/gameengine/Converter/BL_ArmatureObject.cpp')
| -rw-r--r-- | source/gameengine/Converter/BL_ArmatureObject.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source/gameengine/Converter/BL_ArmatureObject.cpp b/source/gameengine/Converter/BL_ArmatureObject.cpp index 72a31566e7c..395cae4ba87 100644 --- a/source/gameengine/Converter/BL_ArmatureObject.cpp +++ b/source/gameengine/Converter/BL_ArmatureObject.cpp @@ -138,19 +138,22 @@ void game_copy_pose(bPose **dst, bPose *src, int copy_constraint) /* Only allowed for Poses with identical channels */ void game_blend_poses(bPose *dst, bPose *src, float srcweight/*, short mode*/) -{ +{ + short mode= ACTSTRIPMODE_BLEND; + bPoseChannel *dchan; const bPoseChannel *schan; bConstraint *dcon, *scon; float dstweight; int i; - short mode = ACTSTRIPMODE_BLEND; switch (mode){ case ACTSTRIPMODE_BLEND: dstweight = 1.0F - srcweight; break; case ACTSTRIPMODE_ADD: + dstweight = 1.0F; + break; default : dstweight = 1.0F; } |