Fix for when knife tool (with path setting) is terminated with ctrl-Enter.
authorChris Want <cwant@ualberta.ca>
Tue, 25 Oct 2005 17:43:22 +0000 (17:43 +0000)
committerChris Want <cwant@ualberta.ca>
Tue, 25 Oct 2005 17:43:22 +0000 (17:43 +0000)
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.

source/blender/src/editmesh_loop.c
source/blender/src/editmesh_tools.c

index 2e6f1e8309c3a1999f07611d414a6f4f275f37bc..01ac141f7ef4fcba1f25ec65ab42f8d944366caf 100644 (file)
@@ -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);
        
index 85e383bcd445dd07ef6489b6d0872eb9d0e05b49..49ffb44f85d4661cf82b94eff194951ad2843f20 100644 (file)
@@ -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;