diff options
| author | Geoffrey Bantle <hairbat@yahoo.com> | 2006-02-14 01:49:46 +0300 |
|---|---|---|
| committer | Geoffrey Bantle <hairbat@yahoo.com> | 2006-02-14 01:49:46 +0300 |
| commit | 1f21e2eea708ee73491b508c29b159ae170fe713 (patch) | |
| tree | a4a3e84cb6c88a13c3848f7692e94734d9c1cf3c /source/blender/include/BIF_editmesh.h | |
| parent | 9104862f48b0caf3131f583a382fcce3b4b7c289 (diff) | |
Modified Files:
source/blender/blenlib/BLI_editVert.h
source/blender/include/BIF_editmesh.h
source/blender/src/edit.c source/blender/src/editmesh.c
source/blender/src/editmesh_lib.c
source/blender/src/editmesh_mods.c
source/blender/src/editmesh_tools.c
source/blender/src/header_view3d.c
Log:
Commit of the 'upgraded merge tools' (Patch #3345) and 'inclusive selection mode conversion' (Patch #3768).
Diffstat (limited to 'source/blender/include/BIF_editmesh.h')
| -rw-r--r-- | source/blender/include/BIF_editmesh.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/include/BIF_editmesh.h b/source/blender/include/BIF_editmesh.h index b1620ec58a6..8c5fa1660ce 100644 --- a/source/blender/include/BIF_editmesh.h +++ b/source/blender/include/BIF_editmesh.h @@ -202,5 +202,9 @@ int editface_containsEdge(struct EditFace *efa, struct EditEdge *eed); void shape_copy_select_from(void); void shape_propagate(void); +int collapseEdges(void); +int collapseFaces(void); +int merge_firstlast(int first); + #endif |