archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix for when knife tool (with path setting) is terminated with ctrl-Enter.

Browse Source 
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.
This commit is contained in:
Chris Want
2005-10-25 17:43:22 +00:00
parent 77ad2928c3
commit 2efaa059b5
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/src/editmesh_loop.c
View File

@@ -477,7 +477,8 @@ static CutCurve *get_mouse_trail(int *len, char mode)
mywinset(curarea->win); mywinset(curarea->win);
glDrawBuffer(GL_FRONT); 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); persp(PERSP_WIN);

8
source/blender/src/editmesh_tools.c
View File

@@ -1717,10 +1717,14 @@ static void fill_quad_double_adj_path(EditFace *efa, struct GHash *gh, int numcu
// Make outside tris // Make outside tris
hold = addfacelist(verts[0][vertsize-2],verts[0][vertsize-1],verts[1][1],NULL,NULL,NULL); 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); facecopy(efa,hold);
hold = addfacelist(verts[0][0],verts[1][vertsize-1],v[(start2+2)%4],NULL,NULL,NULL); 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); facecopy(efa,hold);
//if(G.scene->toolsettings->editbutflag & B_AUTOFGON) { //if(G.scene->toolsettings->editbutflag & B_AUTOFGON) {
// hold->e1->h |= EM_FGON; // hold->e1->h |= EM_FGON;