diff options
author | Joseph Eagar <joeedh@gmail.com> | 2010-05-04 16:31:24 +0400 |
---|---|---|
committer | Joseph Eagar <joeedh@gmail.com> | 2010-05-04 16:31:24 +0400 |
commit | a7cbd5008e830224e73e2e55f89d0783ded422e5 (patch) | |
tree | 63f8d80c1db62e0a8f71db6d89de9d95e4b91fa0 /source/blender/makesdna/DNA_action_types.h | |
parent | cef3e3099a8d808474237e26cf373b3943897cb3 (diff) |
merging revisions 28564-28569 from render branch into trunk
Diffstat (limited to 'source/blender/makesdna/DNA_action_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_action_types.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/makesdna/DNA_action_types.h b/source/blender/makesdna/DNA_action_types.h index 18b3c1095cc..181ab6f0afa 100644 --- a/source/blender/makesdna/DNA_action_types.h +++ b/source/blender/makesdna/DNA_action_types.h @@ -344,6 +344,7 @@ typedef struct bPose { void *ikparam; /* IK solver parameters, structure depends on iksolver */ bAnimVizSettings avs; /* settings for visualisation of bone animation */ + char proxy_act_bone[32]; /*proxy active bone name*/ } bPose; |