diff options
| author | Ton Roosendaal <ton@blender.org> | 2004-11-05 16:34:23 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2004-11-05 16:34:23 +0300 |
| commit | c013711c073e7a6e9470c34f6bac73c9af12c3a9 (patch) | |
| tree | 2d104bb707acadedc5269927085c65b1d8ab53a8 /source/blender | |
| parent | b169abb4cfd675ccf1eed2bcb441797d06fa3abc (diff) | |
Inserted new convex method in beveling for editmesh too.
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/src/editmesh_tools.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/source/blender/src/editmesh_tools.c b/source/blender/src/editmesh_tools.c index 2a7a9fca72b..9cc334f59bf 100644 --- a/source/blender/src/editmesh_tools.c +++ b/source/blender/src/editmesh_tools.c @@ -3305,7 +3305,16 @@ void bevel_mesh(float bsize, int allfaces) } } else if (a==4) { if(exist_face(neweve[0], neweve[1], neweve[2], neweve[3])==0) { - efa= addfacelist(neweve[0], neweve[1], neweve[2], neweve[3], example,NULL); + /* the order of vertices can be anything, three cases to check */ + if( convex(neweve[0]->co, neweve[1]->co, neweve[2]->co, neweve[3]->co) ) { + efa= addfacelist(neweve[0], neweve[1], neweve[2], neweve[3], NULL, NULL); + } + else if( convex(neweve[0]->co, neweve[2]->co, neweve[3]->co, neweve[1]->co) ) { + efa= addfacelist(neweve[0], neweve[2], neweve[3], neweve[1], NULL, NULL); + } + else { + efa= addfacelist(neweve[0], neweve[2], neweve[1], neweve[3], NULL, NULL); + } } } else if (a==3) { |