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_meshtools.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_meshtools.h')
| -rw-r--r-- | source/blender/include/BIF_meshtools.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/include/BIF_meshtools.h b/source/blender/include/BIF_meshtools.h index 8df5e7255a5..e926d41faf1 100644 --- a/source/blender/include/BIF_meshtools.h +++ b/source/blender/include/BIF_meshtools.h @@ -36,7 +36,7 @@ struct Object; struct EditVert; -extern void join_mesh(void); +extern int join_mesh(void); extern void fasterdraw(void); extern void slowerdraw(void); |