diff options
Diffstat (limited to 'source/blender/editors/transform/transform_manipulator.c')
-rw-r--r-- | source/blender/editors/transform/transform_manipulator.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/source/blender/editors/transform/transform_manipulator.c b/source/blender/editors/transform/transform_manipulator.c index 5e5dbfdf80a..8131758f93c 100644 --- a/source/blender/editors/transform/transform_manipulator.c +++ b/source/blender/editors/transform/transform_manipulator.c @@ -293,7 +293,7 @@ static int calc_manipulator_stats(const bContext *C) float vec[3] = {0, 0, 0}; /* USE LAST SELECTE WITH ACTIVE */ - if ((v3d->around == V3D_ACTIVE) && BM_select_history_active_get(em->bm, &ese)) { + if ((v3d->around == V3D_AROUND_ACTIVE) && BM_select_history_active_get(em->bm, &ese)) { BM_editselection_center(&ese, vec); calc_tw_center(scene, vec); totsel = 1; @@ -318,7 +318,7 @@ static int calc_manipulator_stats(const bContext *C) bArmature *arm = obedit->data; EditBone *ebo; - if ((v3d->around == V3D_ACTIVE) && (ebo = arm->act_edbone)) { + if ((v3d->around == V3D_AROUND_ACTIVE) && (ebo = arm->act_edbone)) { /* doesn't check selection or visibility intentionally */ if (ebo->flag & BONE_TIPSEL) { calc_tw_center(scene, ebo->tail); @@ -354,7 +354,7 @@ static int calc_manipulator_stats(const bContext *C) Curve *cu = obedit->data; float center[3]; - if (v3d->around == V3D_ACTIVE && ED_curve_active_center(cu, center)) { + if (v3d->around == V3D_AROUND_ACTIVE && ED_curve_active_center(cu, center)) { calc_tw_center(scene, center); totsel++; } @@ -386,11 +386,11 @@ static int calc_manipulator_stats(const bContext *C) } else { if (bezt->f1 & SELECT) { - calc_tw_center(scene, bezt->vec[(v3d->around == V3D_LOCAL) ? 1 : 0]); + calc_tw_center(scene, bezt->vec[(v3d->around == V3D_AROUND_LOCAL_ORIGINS) ? 1 : 0]); totsel++; } if (bezt->f3 & SELECT) { - calc_tw_center(scene, bezt->vec[(v3d->around == V3D_LOCAL) ? 1 : 2]); + calc_tw_center(scene, bezt->vec[(v3d->around == V3D_AROUND_LOCAL_ORIGINS) ? 1 : 2]); totsel++; } } @@ -416,7 +416,7 @@ static int calc_manipulator_stats(const bContext *C) MetaBall *mb = (MetaBall *)obedit->data; MetaElem *ml; - if ((v3d->around == V3D_ACTIVE) && (ml = mb->lastelem)) { + if ((v3d->around == V3D_AROUND_ACTIVE) && (ml = mb->lastelem)) { calc_tw_center(scene, &ml->x); totsel++; } @@ -433,7 +433,7 @@ static int calc_manipulator_stats(const bContext *C) Lattice *lt = ((Lattice *)obedit->data)->editlatt->latt; BPoint *bp; - if ((v3d->around == V3D_ACTIVE) && (bp = BKE_lattice_active_point_get(lt))) { + if ((v3d->around == V3D_AROUND_ACTIVE) && (bp = BKE_lattice_active_point_get(lt))) { calc_tw_center(scene, bp->vec); totsel++; } @@ -465,7 +465,7 @@ static int calc_manipulator_stats(const bContext *C) if ((ob->lay & v3d->lay) == 0) return 0; - if ((v3d->around == V3D_ACTIVE) && (pchan = BKE_pose_channel_active(ob))) { + if ((v3d->around == V3D_AROUND_ACTIVE) && (pchan = BKE_pose_channel_active(ob))) { /* doesn't check selection or visibility intentionally */ Bone *bone = pchan->bone; if (bone) { @@ -1592,11 +1592,11 @@ void BIF_draw_manipulator(const bContext *C) /* now we can define center */ switch (v3d->around) { - case V3D_CENTER: - case V3D_ACTIVE: + case V3D_AROUND_CENTER_BOUNDS: + case V3D_AROUND_ACTIVE: { Object *ob; - if (((v3d->around == V3D_ACTIVE) && (scene->obedit == NULL)) && + if (((v3d->around == V3D_AROUND_ACTIVE) && (scene->obedit == NULL)) && ((ob = OBACT) && !(ob->mode & OB_MODE_POSE))) { copy_v3_v3(rv3d->twmat[3], ob->obmat[3]); @@ -1606,11 +1606,11 @@ void BIF_draw_manipulator(const bContext *C) } break; } - case V3D_LOCAL: - case V3D_CENTROID: + case V3D_AROUND_LOCAL_ORIGINS: + case V3D_AROUND_CENTER_MEAN: copy_v3_v3(rv3d->twmat[3], scene->twcent); break; - case V3D_CURSOR: + case V3D_AROUND_CURSOR: copy_v3_v3(rv3d->twmat[3], ED_view3d_cursor3d_get(scene, v3d)); break; } |