diff options
author | Campbell Barton <ideasman42@gmail.com> | 2015-02-23 15:05:54 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2015-02-23 15:05:54 +0300 |
commit | 34479d8b63c9ef04ec14d99647f0c46b676b6ca6 (patch) | |
tree | f4d5cacdd73000c2917a60ea7b3891294e28c9d4 | |
parent | 17b847910169d03051959c77992217936f6a8167 (diff) |
Snap to Active: missing armature/pose/mball/curve
de-duplicate active center calc between transform & snap-to-selected.
-rw-r--r-- | source/blender/editors/include/ED_object.h | 2 | ||||
-rw-r--r-- | source/blender/editors/object/object_edit.c | 65 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/view3d_snap.c | 44 | ||||
-rw-r--r-- | source/blender/editors/transform/transform_generics.c | 60 |
4 files changed, 92 insertions, 79 deletions
diff --git a/source/blender/editors/include/ED_object.h b/source/blender/editors/include/ED_object.h index ccdde39f263..295bb752a08 100644 --- a/source/blender/editors/include/ED_object.h +++ b/source/blender/editors/include/ED_object.h @@ -138,6 +138,8 @@ void ED_object_editmode_exit(struct bContext *C, int flag); void ED_object_editmode_enter(struct bContext *C, int flag); bool ED_object_editmode_load(struct Object *obedit); +bool ED_object_editmode_calc_active_center(struct Object *obedit, const bool select_only, float r_center[3]); + void ED_object_location_from_view(struct bContext *C, float loc[3]); void ED_object_rotation_from_view(struct bContext *C, float rot[3], const char align_axis); void ED_object_base_init_transform(struct bContext *C, struct Base *base, const float loc[3], const float rot[3]); diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c index 749a178752a..458feebaec7 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -66,6 +66,7 @@ #include "BKE_effect.h" #include "BKE_depsgraph.h" #include "BKE_image.h" +#include "BKE_lattice.h" #include "BKE_library.h" #include "BKE_main.h" #include "BKE_material.h" @@ -1999,3 +2000,67 @@ void OBJECT_OT_game_physics_copy(struct wmOperatorType *ot) /* flags */ ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; } + +/* generic utility function */ + +bool ED_object_editmode_calc_active_center(Object *obedit, const bool select_only, float r_center[3]) +{ + switch (obedit->type) { + case OB_MESH: + { + BMEditMesh *em = BKE_editmesh_from_object(obedit); + BMEditSelection ese; + + if (BM_select_history_active_get(em->bm, &ese)) { + BM_editselection_center(&ese, r_center); + return true; + } + break; + } + case OB_ARMATURE: + { + bArmature *arm = obedit->data; + EditBone *ebo = arm->act_edbone; + + if (ebo && (!select_only || (ebo->flag & (BONE_SELECTED | BONE_ROOTSEL)))) { + copy_v3_v3(r_center, ebo->head); + return true; + } + + break; + } + case OB_CURVE: + case OB_SURF: + { + Curve *cu = obedit->data; + + if (ED_curve_active_center(cu, r_center)) { + return true; + } + break; + } + case OB_MBALL: + { + MetaBall *mb = obedit->data; + MetaElem *ml_act = mb->lastelem; + + if (ml_act && (!select_only || (ml_act->flag & SELECT))) { + copy_v3_v3(r_center, &ml_act->x); + return true; + } + break; + } + case OB_LATTICE: + { + BPoint *actbp = BKE_lattice_active_point_get(obedit->data); + + if (actbp) { + copy_v3_v3(r_center, actbp->vec); + return true; + } + break; + } + } + + return false; +}
\ No newline at end of file diff --git a/source/blender/editors/space_view3d/view3d_snap.c b/source/blender/editors/space_view3d/view3d_snap.c index 266f28deb6c..c865d5ce577 100644 --- a/source/blender/editors/space_view3d/view3d_snap.c +++ b/source/blender/editors/space_view3d/view3d_snap.c @@ -33,11 +33,13 @@ #include "DNA_armature_types.h" #include "DNA_curve_types.h" #include "DNA_object_types.h" +#include "DNA_meta_types.h" #include "BLI_blenlib.h" #include "BLI_utildefines.h" #include "BLI_math.h" +#include "BKE_action.h" #include "BKE_armature.h" #include "BKE_context.h" #include "BKE_depsgraph.h" @@ -53,9 +55,11 @@ #include "RNA_access.h" #include "RNA_define.h" +#include "ED_object.h" #include "ED_transverts.h" #include "ED_keyframing.h" #include "ED_screen.h" +#include "ED_curve.h" #include "view3d_intern.h" @@ -600,40 +604,36 @@ void VIEW3D_OT_snap_cursor_to_selected(wmOperatorType *ot) /* ********************************************** */ +/* this could be exported to be a generic function + * see: calculateCenterActive */ + static bool snap_calc_active_center(bContext *C, float r_center[3]) { Object *obedit = CTX_data_edit_object(C); - Object *obact = CTX_data_active_object(C); if (obedit) { - if (obedit->type == OB_MESH) { - BMEditMesh *em = BKE_editmesh_from_object(obedit); - /* check active */ - BMEditSelection ese; - - if (BM_select_history_active_get(em->bm, &ese)) { - BM_editselection_center(&ese, r_center); - return true; - } - + if (ED_object_editmode_calc_active_center(obedit, false, r_center)) { mul_m4_v3(obedit->obmat, r_center); } - else if (obedit->type == OB_LATTICE) { - BPoint *actbp = BKE_lattice_active_point_get(obedit->data); + } + else { + Object *ob = CTX_data_active_object(C); - if (actbp) { - copy_v3_v3(r_center, actbp->vec); - mul_m4_v3(obedit->obmat, r_center); + if (ob) { + if (ob->mode & OB_MODE_POSE) { + bPoseChannel *pchan = BKE_pose_channel_active(ob); + if (pchan) { + copy_v3_v3(r_center, pchan->pose_head); + mul_m4_v3(ob->obmat, r_center); + return true; + } + } + else { + copy_v3_v3(r_center, ob->obmat[3]); return true; } } } - else { - if (obact) { - copy_v3_v3(r_center, obact->obmat[3]); - return true; - } - } return false; } diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c index f7764769693..d4c3b05f11e 100644 --- a/source/blender/editors/transform/transform_generics.c +++ b/source/blender/editors/transform/transform_generics.c @@ -87,6 +87,7 @@ #include "ED_keyframing.h" #include "ED_markers.h" #include "ED_mesh.h" +#include "ED_object.h" #include "ED_particle.h" #include "ED_screen_types.h" #include "ED_space_api.h" @@ -1682,63 +1683,8 @@ bool calculateCenterActive(TransInfo *t, bool select_only, float r_center[3]) bool ok = false; if (t->obedit) { - switch (t->obedit->type) { - case OB_MESH: - { - BMEditSelection ese; - BMEditMesh *em = BKE_editmesh_from_object(t->obedit); - - if (BM_select_history_active_get(em->bm, &ese)) { - BM_editselection_center(&ese, r_center); - ok = true; - } - break; - } - case OB_ARMATURE: - { - bArmature *arm = t->obedit->data; - EditBone *ebo = arm->act_edbone; - - if (ebo && (!select_only || (ebo->flag & (BONE_SELECTED | BONE_ROOTSEL)))) { - copy_v3_v3(r_center, ebo->head); - ok = true; - } - - break; - } - case OB_CURVE: - case OB_SURF: - { - float center[3]; - Curve *cu = (Curve *)t->obedit->data; - - if (ED_curve_active_center(cu, center)) { - copy_v3_v3(r_center, center); - ok = true; - } - break; - } - case OB_MBALL: - { - MetaBall *mb = (MetaBall *)t->obedit->data; - MetaElem *ml_act = mb->lastelem; - - if (ml_act && (!select_only || (ml_act->flag & SELECT))) { - copy_v3_v3(r_center, &ml_act->x); - ok = true; - } - break; - } - case OB_LATTICE: - { - BPoint *actbp = BKE_lattice_active_point_get(t->obedit->data); - - if (actbp) { - copy_v3_v3(r_center, actbp->vec); - ok = true; - } - break; - } + if (ED_object_editmode_calc_active_center(t->obedit, select_only, r_center)) { + ok = true; } } else if (t->flag & T_POSE) { |