Merge branch 'master' into blender2.8

[blender.git] / source / blender / editors / transform / transform_snap.c

diff --git a/source/blender/editors/transform/transform_snap.c b/source/blender/editors/transform/transform_snap.c
index e1cf743623668207013c7cccd992cf69df0ead1c..2fc116b64bae6e8d7fba3b277c1a85bc6be097b6 100644 (file)
--- a/source/blender/editors/transform/transform_snap.c
+++ b/source/blender/editors/transform/transform_snap.c
@@ -519,8 +519,6 @@ static void initSnappingMode(TransInfo *t)
 {
        ToolSettings *ts = t->settings;
        Object *obedit = t->obedit;
-       Scene *scene = t->scene;
-       Base *base_act = scene->basact;
 
        if (t->spacetype == SPACE_NODE) {
                /* force project off when not supported */
@@ -559,12 +557,6 @@ static void initSnappingMode(TransInfo *t)
                                t->tsnap.modeSelect = t->tsnap.snap_self ? SNAP_ALL : SNAP_NOT_ACTIVE;
                        }
                }
-               /* Particles edit mode*/
-               else if (t->tsnap.applySnap != NULL && // A snapping function actually exist
-                        (obedit == NULL && base_act && base_act->object && base_act->object->mode & OB_MODE_PARTICLE_EDIT))
-               {
-                       t->tsnap.modeSelect = SNAP_ALL;
-               }
                /* Object mode */
                else if (t->tsnap.applySnap != NULL && // A snapping function actually exist
                         (obedit == NULL) ) // Object Mode