diff options
| author | Ton Roosendaal <ton@blender.org> | 2006-01-04 00:43:31 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2006-01-04 00:43:31 +0300 |
| commit | f47899fc0f716464625f43045458e222ce11603d (patch) | |
| tree | 1051359e7eb24a5d40826a0ea7aaa925da7d92c0 /source/blender/include/BIF_editarmature.h | |
| parent | 9557c3a66dccc357f7a8cfecca8e23639208afd2 (diff) | |
| parent | 14d5cd1c3145e6f7d6645e1d9623eb9d5d244ad9 (diff) | |
Orange; merger with bf-blender.
(Merging is *not* fun work, especially not with bugfixes in main branch
for code that got cleaned up in the other! Poor Hos... :)
Diffstat (limited to 'source/blender/include/BIF_editarmature.h')
| -rw-r--r-- | source/blender/include/BIF_editarmature.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/include/BIF_editarmature.h b/source/blender/include/BIF_editarmature.h index 75aa02bfa57..7766accdab6 100644 --- a/source/blender/include/BIF_editarmature.h +++ b/source/blender/include/BIF_editarmature.h @@ -87,7 +87,7 @@ void subdivide_armature(void); void free_editArmature(void); -void join_armature(void); +int join_armature(void); void load_editArmature(void); void make_bone_parent(void); |