diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2010-04-18 06:03:19 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2010-04-18 06:03:19 +0400 |
| commit | dfe2f8dc03267e041102837e92f547fb04881510 (patch) | |
| tree | d9582c4667ce5b9e39e2adce40832aa4f44b4fe7 /source/blender/blenkernel/intern/action.c | |
| parent | d7e08f2d33207fdf76b1b597ef0de9dec26e3987 (diff) | |
| parent | 00e46ef739cf2bfddb8805af056aa59fd3b3c71c (diff) | |
Merged changes in the trunk up to revision 28247.
Diffstat (limited to 'source/blender/blenkernel/intern/action.c')
| -rw-r--r-- | source/blender/blenkernel/intern/action.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/action.c b/source/blender/blenkernel/intern/action.c index 365ac2371b8..fc7b22fa63e 100644 --- a/source/blender/blenkernel/intern/action.c +++ b/source/blender/blenkernel/intern/action.c @@ -396,7 +396,7 @@ bPoseChannel *get_pose_channel(const bPose *pose, const char *name) return NULL; if(pose->chanhash) - return BLI_ghash_lookup(pose->chanhash, name); + return BLI_ghash_lookup(pose->chanhash, (void *)name); return BLI_findstring(&((bPose *)pose)->chanbase, name, offsetof(bPoseChannel, name)); } |