diff options
| author | Joerg Mueller <nexyon@gmail.com> | 2011-06-22 01:10:36 +0400 |
|---|---|---|
| committer | Joerg Mueller <nexyon@gmail.com> | 2011-06-22 01:10:36 +0400 |
| commit | 11c0ee5c76a75460901334bbe4ae4370e08d22ae (patch) | |
| tree | 2f767771368e1ed74524c2a348f15317ff1ca1dc /source/blender/editors/transform | |
| parent | 2d3d025e8cf8776361e6397502f4e240ae9a5ccc (diff) | |
| parent | 3c8056a40bf687fd07abbeb8ab889b84e01243a6 (diff) | |
Merged with trunk r37717.
Diffstat (limited to 'source/blender/editors/transform')
| -rw-r--r-- | source/blender/editors/transform/transform_snap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/transform/transform_snap.c b/source/blender/editors/transform/transform_snap.c index c4d6eb02028..d9d9b0f9102 100644 --- a/source/blender/editors/transform/transform_snap.c +++ b/source/blender/editors/transform/transform_snap.c @@ -385,8 +385,8 @@ static void initSnappingMode(TransInfo *t) if (t->tsnap.applySnap != NULL && // A snapping function actually exist (obedit != NULL && ELEM4(obedit->type, OB_MESH, OB_ARMATURE, OB_CURVE, OB_LATTICE)) ) // Temporary limited to edit mode meshes, armature, curves { - /* editmode meshes now supported */ - if ((obedit->type != OB_MESH) && ((t->flag & T_PROP_EDIT) || t->tsnap.project)) /* also exclude edit for project, for now */ + /* Exclude editmesh if using proportional edit */ + if ((obedit->type == OB_MESH) && (t->flag & T_PROP_EDIT)) { t->tsnap.modeSelect = SNAP_NOT_OBEDIT; } |