diff options
| author | Martin Poirier <theeth@yahoo.com> | 2011-06-21 19:28:13 +0400 |
|---|---|---|
| committer | Martin Poirier <theeth@yahoo.com> | 2011-06-21 19:28:13 +0400 |
| commit | 8a335767d51b466d857b3d3ffeeccc0e6b2f2f60 (patch) | |
| tree | 38e17da37ca07db9bee0cde8049fb5daff465da4 /source/blender | |
| parent | 5dd76a3f4e1c6df77177d7751050784f8ee7a600 (diff) | |
Snapping/Project
Disable editmesh as target if proportional edit is on (that was messed up incorrectly in revision 33233)
Diffstat (limited to 'source/blender')
| -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; } |