diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2006-06-27 08:30:06 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2006-06-27 08:30:06 +0400 |
| commit | e0aa1dd29571229c995a2abd5b56782e8a5fbbae (patch) | |
| tree | fa1620dfbdbdc53a1e431bde657bc140cb92e013 | |
| parent | 0a8ac15e67ad45fa75b9b493ed5b54c66500b0c2 (diff) | |
previous commit to editface made it impossible to leave faceSelect mode of the object was in an unseen layer.
Now you can leave faceSelect/UV mode while the object is hidden but not enter it. This is how editmode works.
Tweak to crease comparison.
| -rw-r--r-- | source/blender/src/editface.c | 4 | ||||
| -rw-r--r-- | source/blender/src/editmesh_mods.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/src/editface.c b/source/blender/src/editface.c index 603d9ae4e74..a906cc275fd 100644 --- a/source/blender/src/editface.c +++ b/source/blender/src/editface.c @@ -1424,7 +1424,7 @@ void set_faceselect() /* toggle */ Object *ob = OBACT; Mesh *me = 0; - if(ob==NULL || (ob->lay & G.vd->lay)==0) return; + if(ob==NULL) return; if(ob->id.lib) { error("Can't edit library data"); return; @@ -1451,7 +1451,7 @@ void set_faceselect() /* toggle */ BIF_undo_push("End UV Faceselect"); } } - else if (me) { + else if (me && (ob->lay & G.vd->lay)) { G.f |= G_FACESELECT; if(me->tface==NULL) make_tfaces(me); diff --git a/source/blender/src/editmesh_mods.c b/source/blender/src/editmesh_mods.c index b46c3103735..a69e3d3ca6e 100644 --- a/source/blender/src/editmesh_mods.c +++ b/source/blender/src/editmesh_mods.c @@ -1042,7 +1042,7 @@ int edgegroup_select(short mode) if ( !(eed->f & SELECT) && !eed->h && - (fabs(base_eed->crease-eed->crease) < thresh) + (fabs(base_eed->crease-eed->crease) <= thresh) ) { EM_select_edge(eed, 1); selcount++; |