Merge branch 'master' into blender2.8
[blender.git] / source / blender / editors / transform / transform_snap_object.c
index 59dfe18139a046709bf4cbe663a85a741a67d227..ed6d49da68140de94671fb273194ce3241470a9b 100644 (file)
@@ -1461,23 +1461,7 @@ static bool snapObjectsRay(
 
        unsigned int ob_index = 0;
        Object *obedit = use_object_edit_cage ? sctx->scene->obedit : NULL;
-
-       /* Need an exception for particle edit because the base is flagged with BA_HAS_RECALC_DATA
-        * which makes the loop skip it, even the derived mesh will never change
-        *
-        * To solve that problem, we do it first as an exception.
-        * */
        Base *base_act = sctx->scene->basact;
-       if (base_act && base_act->object && base_act->object->mode & OB_MODE_PARTICLE_EDIT) {
-               Object *ob = base_act->object;
-
-               retval |= snapObject(
-                       sctx, ob, ob->obmat, ob_index++,
-                       false, snap_to,
-                       ray_origin, ray_start, ray_normal, ray_depth_range,
-                       ray_depth, dist_to_ray_sq,
-                       r_loc, r_no, r_index, r_ob, r_obmat, r_hit_list);
-       }
 
        bool ignore_object_selected = false, ignore_object_active = false;
        switch (snap_select) {