diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:17:24 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:21:24 +0300 |
commit | e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch) | |
tree | 8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/editors/object/object_utils.c | |
parent | b3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff) |
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211.
For details on usage and instructions for migrating branches
without conflicts, see:
https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'source/blender/editors/object/object_utils.c')
-rw-r--r-- | source/blender/editors/object/object_utils.c | 181 |
1 files changed, 88 insertions, 93 deletions
diff --git a/source/blender/editors/object/object_utils.c b/source/blender/editors/object/object_utils.c index 39f5dad7698..06a755c30bd 100644 --- a/source/blender/editors/object/object_utils.c +++ b/source/blender/editors/object/object_utils.c @@ -39,111 +39,106 @@ #include "ED_armature.h" #include "ED_curve.h" -#include "ED_object.h" /* own include */ - +#include "ED_object.h" /* own include */ /* -------------------------------------------------------------------- */ /** \name Active Element Center * \{ */ -bool ED_object_calc_active_center_for_editmode( - Object *obedit, const bool select_only, float r_center[3]) +bool ED_object_calc_active_center_for_editmode(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; + 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; } -bool ED_object_calc_active_center_for_posemode( - Object *ob, const bool select_only, float r_center[3]) +bool ED_object_calc_active_center_for_posemode(Object *ob, + const bool select_only, + float r_center[3]) { - bPoseChannel *pchan = BKE_pose_channel_active(ob); - if (pchan && (!select_only || (pchan->bone->flag & BONE_SELECTED))) { - copy_v3_v3(r_center, pchan->pose_head); - return true; - } - return false; + bPoseChannel *pchan = BKE_pose_channel_active(ob); + if (pchan && (!select_only || (pchan->bone->flag & BONE_SELECTED))) { + copy_v3_v3(r_center, pchan->pose_head); + return true; + } + return false; } -bool ED_object_calc_active_center( - Object *ob, const bool select_only, float r_center[3]) +bool ED_object_calc_active_center(Object *ob, const bool select_only, float r_center[3]) { - if (ob->mode & OB_MODE_EDIT) { - if (ED_object_calc_active_center_for_editmode(ob, select_only, r_center)) { - mul_m4_v3(ob->obmat, r_center); - return true; - } - return false; - } - else if (ob->mode & OB_MODE_POSE) { - if (ED_object_calc_active_center_for_posemode(ob, select_only, r_center)) { - mul_m4_v3(ob->obmat, r_center); - return true; - } - return false; - } - else { - if (!select_only || (ob->flag & SELECT)) { - copy_v3_v3(r_center, ob->obmat[3]); - return true; - } - return false; - } + if (ob->mode & OB_MODE_EDIT) { + if (ED_object_calc_active_center_for_editmode(ob, select_only, r_center)) { + mul_m4_v3(ob->obmat, r_center); + return true; + } + return false; + } + else if (ob->mode & OB_MODE_POSE) { + if (ED_object_calc_active_center_for_posemode(ob, select_only, r_center)) { + mul_m4_v3(ob->obmat, r_center); + return true; + } + return false; + } + else { + if (!select_only || (ob->flag & SELECT)) { + copy_v3_v3(r_center, ob->obmat[3]); + return true; + } + return false; + } } /** \} */ |