diff options
author | Lukas Tönne <lukas.toenne@gmail.com> | 2016-04-16 13:39:41 +0300 |
---|---|---|
committer | Lukas Tönne <lukas.toenne@gmail.com> | 2016-04-16 13:39:41 +0300 |
commit | cd0ec340c44709cc0e7547b9f30a50fcc0c5d1c2 (patch) | |
tree | 0870e85ecb94fd6f4b286540bdf71db5b295faa3 /source/blender/editors/transform/transform_snap.c | |
parent | 15c8d095e5f5364ef4fb4cc7a8412fd9c5c2e9fa (diff) |
Removed remaining uses of the particle edit mode flag.
Diffstat (limited to 'source/blender/editors/transform/transform_snap.c')
-rw-r--r-- | source/blender/editors/transform/transform_snap.c | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/source/blender/editors/transform/transform_snap.c b/source/blender/editors/transform/transform_snap.c index bb9120c337b..70ac225c431 100644 --- a/source/blender/editors/transform/transform_snap.c +++ b/source/blender/editors/transform/transform_snap.c @@ -497,8 +497,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 */ @@ -537,12 +535,6 @@ static void initSnappingMode(TransInfo *t) t->tsnap.modeSelect = t->tsnap.snap_self ? SNAP_ALL : SNAP_NOT_OBEDIT; } } - /* 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 @@ -1969,21 +1961,6 @@ static bool snapObjectsRay( r_loc, r_no, r_dist_px, r_index, r_ob, r_obmat); } - /* 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; - if (base && base->object && base->object->mode & OB_MODE_PARTICLE_EDIT) { - Object *ob = base->object; - retval |= snapObject( - scene, ar, ob, ob->obmat, false, - mval, snap_to, - ray_start, ray_normal, ray_origin, ray_depth, - r_loc, r_no, r_dist_px, r_index, r_ob, r_obmat); - } - for (base = FIRSTBASE; base != NULL; base = base->next) { if ((BASE_VISIBLE_BGMODE(v3d, scene, base)) && (base->flag & (BA_HAS_RECALC_OB | BA_HAS_RECALC_DATA)) == 0 && |