diff options
author | Chris Want <cwant@ualberta.ca> | 2005-10-25 21:43:22 +0400 |
---|---|---|
committer | Chris Want <cwant@ualberta.ca> | 2005-10-25 21:43:22 +0400 |
commit | 2efaa059b5be0a53a6c94398083e2d3fa7f884ab (patch) | |
tree | 25c24e5e6b6e4cab3f7ec16215d0ed1664746bf6 /source | |
parent | 77ad2928c31cbd9a1f2a7769cca27b17fa5c2a1a (diff) |
Fix for when knife tool (with path setting) is terminated with ctrl-Enter.
Also, updated the little helper line on the status bar to indicate that
terminating with ctrl-Enter leaves only the verts on the cut line
selected.
Johnny: Please review.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/src/editmesh_loop.c | 3 | ||||
-rw-r--r-- | source/blender/src/editmesh_tools.c | 8 |
2 files changed, 8 insertions, 3 deletions
diff --git a/source/blender/src/editmesh_loop.c b/source/blender/src/editmesh_loop.c index 2e6f1e8309c..01ac141f7ef 100644 --- a/source/blender/src/editmesh_loop.c +++ b/source/blender/src/editmesh_loop.c @@ -477,7 +477,8 @@ static CutCurve *get_mouse_trail(int *len, char mode) mywinset(curarea->win); glDrawBuffer(GL_FRONT); - headerprint("LMB to draw, Enter to finish, ESC to abort."); + headerprint("LMB to draw, Enter to finish (with CTRL to leave only the " + "cut line selected), ESC to abort."); persp(PERSP_WIN); diff --git a/source/blender/src/editmesh_tools.c b/source/blender/src/editmesh_tools.c index 85e383bcd44..49ffb44f85d 100644 --- a/source/blender/src/editmesh_tools.c +++ b/source/blender/src/editmesh_tools.c @@ -1717,10 +1717,14 @@ static void fill_quad_double_adj_path(EditFace *efa, struct GHash *gh, int numcu // Make outside tris hold = addfacelist(verts[0][vertsize-2],verts[0][vertsize-1],verts[1][1],NULL,NULL,NULL); - hold->e3->f2 |= EDGEINNER; + /* when ctrl is depressed, only want verts on the cutline selected */ + if (G.qual != LR_CTRLKEY) + hold->e3->f2 |= EDGEINNER; facecopy(efa,hold); hold = addfacelist(verts[0][0],verts[1][vertsize-1],v[(start2+2)%4],NULL,NULL,NULL); - hold->e1->f2 |= EDGEINNER; + /* when ctrl is depressed, only want verts on the cutline selected */ + if (G.qual != LR_CTRLKEY) + hold->e1->f2 |= EDGEINNER; facecopy(efa,hold); //if(G.scene->toolsettings->editbutflag & B_AUTOFGON) { // hold->e1->h |= EM_FGON; |