diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-11-30 16:52:34 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-11-30 16:52:34 +0300 |
| commit | 47a4a7c8b7623f0c82be1cf01862ea6f22d7adae (patch) | |
| tree | 2972334f401bc76ceaa1142b4cc89471586a1305 | |
| parent | 059b878240a93a022eadce74b387ee737f8f1ab5 (diff) | |
Transform: Remove some legacy code about snapping in particle edit mode
It looks stupid to first force some flag being set and then have workaround
to ignore that flag in snapping code. Let's just not set the flag in the first
place.
The only useful situation where such snapping was usable is to move roots of
disconnected hair, which still works just fine. However, there might be some
other hidden corner case where this workaround was needed.
| -rw-r--r-- | source/blender/editors/transform/transform_conversions.c | 3 | ||||
| -rw-r--r-- | source/blender/editors/transform/transform_snap_object.c | 9 |
2 files changed, 0 insertions, 12 deletions
diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index af83b666bba..9f0f4429f98 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -1905,7 +1905,6 @@ static void createTransParticleVerts(bContext *C, TransInfo *t) { TransData *td = NULL; TransDataExtension *tx; - Base *base = CTX_data_active_base(C); Object *ob = CTX_data_active_object(C); ParticleEditSettings *pset = PE_settings(t->scene); PTCacheEdit *edit = PE_get_current(t->scene, ob); @@ -1925,8 +1924,6 @@ static void createTransParticleVerts(bContext *C, TransInfo *t) if (psys) psmd = psys_get_modifier(ob, psys); - base->flag |= BA_HAS_RECALC_DATA; - for (i = 0, point = edit->points; i < edit->totpoint; i++, point++) { point->flag &= ~PEP_TRANSFORM; transformparticle = 0; diff --git a/source/blender/editors/transform/transform_snap_object.c b/source/blender/editors/transform/transform_snap_object.c index 737005ccf8b..bf4893c2c52 100644 --- a/source/blender/editors/transform/transform_snap_object.c +++ b/source/blender/editors/transform/transform_snap_object.c @@ -156,15 +156,6 @@ static void iter_snap_objects( void *data) { Base *base_act = sctx->scene->basact; - /* 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. - * */ - if (base_act && base_act->object && base_act->object->mode & OB_MODE_PARTICLE_EDIT) { - sob_callback(sctx, false, base_act->object, base_act->object->obmat, data); - } - for (Base *base = sctx->scene->base.first; base != NULL; base = base->next) { if ((BASE_VISIBLE_BGMODE(sctx->v3d_data.v3d, sctx->scene, base)) && (base->flag & (BA_HAS_RECALC_OB | BA_HAS_RECALC_DATA)) == 0 && |