diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-08-18 19:20:35 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-08-18 19:20:35 +0400 |
commit | 22b30da565de53a0a1d34079d72b08fdb54ec8e3 (patch) | |
tree | 3961db6cd06907f41ca64a8ddff92baa36d318aa /source/blender/makesdna/DNA_action_types.h | |
parent | 44e4c5f8316b34835c7900dc649bf8a1570afc0a (diff) | |
parent | e982e9b04f13be046d194643ed28aaedd6181f3b (diff) |
Merged changes in the trunk up to revision 49986.
Diffstat (limited to 'source/blender/makesdna/DNA_action_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_action_types.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_action_types.h b/source/blender/makesdna/DNA_action_types.h index 618590509b1..9a7feb77cfc 100644 --- a/source/blender/makesdna/DNA_action_types.h +++ b/source/blender/makesdna/DNA_action_types.h @@ -218,7 +218,7 @@ typedef struct bPoseChannel { short rotmode; /* eRotationModes - rotation representation to use */ short pad; - float chan_mat[4][4]; /* matrix result of loc/quat/size , and where we put deform in, see next line */ + float chan_mat[4][4]; /* matrix result of loc/quat/size, and where we put deform in, see next line */ float pose_mat[4][4]; /* constraints accumulate here. in the end, pose_mat = bone->arm_mat * chan_mat * this matrix is object space */ float constinv[4][4]; /* inverse result of constraints. |