archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: de-duplicate active item center access

Browse Source
This commit is contained in:
Campbell Barton
2018-12-13 10:37:01 +11:00
parent 8a804d5da7
commit 0835c224ba
7 changed files with 172 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
source/blender/editors/object/object_edit.c
View File

@@ -1766,68 +1766,6 @@ void OBJECT_OT_mode_set_or_submode(wmOperatorType *ot)
RNA_def_property_flag(prop, PROP_SKIP_SAVE);
}
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;
}
static bool move_to_collection_poll(bContext *C)
{
if (CTX_wm_space_outliner(C) != NULL) {