diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-04-01 17:47:19 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-04-01 17:47:19 +0400 |
| commit | 5524ed9ba2d60331abed47c9df0bc2fcf330b36b (patch) | |
| tree | e8380010f140f022b77236af171d97083a294006 /source/blender/editors/include/ED_anim_api.h | |
| parent | 1360bb6fb0bf0c5c14235c47bf1399accbcecc6f (diff) | |
| parent | 689f3aa174ff795044a4dab719edf60b7b1f5bd3 (diff) | |
Merged changes in the trunk up to revision 55700.
Conflicts resolved:
source/blender/editors/mesh/mesh_intern.h
Diffstat (limited to 'source/blender/editors/include/ED_anim_api.h')
| -rw-r--r-- | source/blender/editors/include/ED_anim_api.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/include/ED_anim_api.h b/source/blender/editors/include/ED_anim_api.h index b8ad40b2bd9..f698f9b0b11 100644 --- a/source/blender/editors/include/ED_anim_api.h +++ b/source/blender/editors/include/ED_anim_api.h @@ -409,7 +409,7 @@ typedef struct bAnimChannelType { * with type being sizeof(ptr_data) which should be fine for runtime use... * - assume that setting has been checked to be valid for current context */ - void *(*setting_ptr)(bAnimListElem * ale, int setting, short *type); + void *(*setting_ptr)(bAnimListElem *ale, int setting, short *type); } bAnimChannelType; /* ------------------------ Drawing API -------------------------- */ |