diff options
| -rw-r--r-- | source/blender/blenloader/intern/writefile.c | 2 | ||||
| -rw-r--r-- | source/blender/src/editmesh_mods.c | 11 |
2 files changed, 4 insertions, 9 deletions
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c index 5b8e1c542c8..d046f6ebc91 100644 --- a/source/blender/blenloader/intern/writefile.c +++ b/source/blender/blenloader/intern/writefile.c @@ -1490,7 +1490,7 @@ static void write_global(WriteData *wd) fg.curscene= G.scene; fg.displaymode= R.displaymode; fg.winpos= R.winpos; - fg.fileflags= G.fileflags; + fg.fileflags= (G.fileflags & ~G_FILE_NO_UI); // prevent to save this, is not good convention, and feature with concerns... fg.globalf= G.f; writestruct(wd, GLOB, "FileGlobal", 1, &fg); diff --git a/source/blender/src/editmesh_mods.c b/source/blender/src/editmesh_mods.c index af6375fd977..aa399005b45 100644 --- a/source/blender/src/editmesh_mods.c +++ b/source/blender/src/editmesh_mods.c @@ -380,7 +380,7 @@ static EditVert *findnearestvert_f(short *dist, short sel) getmouseco_areawin(mval); eve= acto->next; while(eve) { - if(eve->h==0) { + if(eve->h==0 && eve->xs!=3200) { temp= abs(mval[0]- eve->xs)+ abs(mval[1]- eve->ys); if( (eve->f & 1)==sel ) temp+=5; if(temp< *dist) { @@ -395,7 +395,7 @@ static EditVert *findnearestvert_f(short *dist, short sel) if(*dist>3) { eve= em->verts.first; while(eve) { - if(eve->h==0) { + if(eve->h==0 && eve->xs!=3200) { temp= abs(mval[0]- eve->xs)+ abs(mval[1]- eve->ys); if( (eve->f & 1)==sel ) temp+=5; if(temp< *dist) { @@ -465,12 +465,7 @@ static EditEdge *findnearestedge_f(short *dist) if(em->edges.first==NULL) return NULL; else eed= em->edges.first; - /* reset flags */ - for(eve=em->verts.first; eve; eve=eve->next){ - eve->f &= ~2; - } - - calc_meshverts_ext_f2(); /*sets (eve->f & 2) for vertices that aren't visible*/ + calc_meshverts_ext_f2(); /* sets/clears (eve->f & 2) for vertices that aren't visible */ getmouseco_areawin(mval); closest=NULL; |