diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-03-06 22:40:15 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-03-06 22:40:15 +0400 |
commit | 31d2ee9bf77bb991ea4779c47379b2cee84b27ed (patch) | |
tree | fd6f021356fc78d6dfeff9f18f601ce645dd7ffe /source/blender/editors/transform/transform_generics.c | |
parent | 7b7214c72233f72268f72d31fd8626a0f94e557e (diff) |
style cleanup, brackets in else/if, some indentation.
Diffstat (limited to 'source/blender/editors/transform/transform_generics.c')
-rw-r--r-- | source/blender/editors/transform/transform_generics.c | 45 |
1 files changed, 16 insertions, 29 deletions
diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c index 47989f756e1..f3cede75786 100644 --- a/source/blender/editors/transform/transform_generics.c +++ b/source/blender/editors/transform/transform_generics.c @@ -797,8 +797,7 @@ static void recalcData_view3d(TransInfo *t) rotation_between_vecs_to_quat(qrot, td->axismtx[1], vec); mul_qt_v3(qrot, up_axis); } - else - { + else { mul_m3_v3(t->mat, up_axis); } @@ -811,8 +810,7 @@ static void recalcData_view3d(TransInfo *t) transform_armature_mirror_update(t->obedit); } - else - { + else { if(t->state != TRANS_CANCEL) { applyProject(t); } @@ -993,8 +991,7 @@ int initTransInfo (bContext *C, TransInfo *t, wmOperator *op, wmEvent *event) copy_v2_v2_int(t->imval, event->mval); t->event_type = event->type; } - else - { + else { t->imval[0] = 0; t->imval[1] = 0; } @@ -1074,8 +1071,7 @@ int initTransInfo (bContext *C, TransInfo *t, wmOperator *op, wmEvent *event) t->current_orientation = V3D_MANIP_GLOBAL; } } - else - { + else { t->current_orientation = v3d->twmode; } @@ -1121,8 +1117,7 @@ int initTransInfo (bContext *C, TransInfo *t, wmOperator *op, wmEvent *event) t->view = &ar->v2d; t->around = sipo->around; } - else - { + else { if(ar) { // XXX for now, get View2D from the active region t->view = &ar->v2d; @@ -1141,10 +1136,8 @@ int initTransInfo (bContext *C, TransInfo *t, wmOperator *op, wmEvent *event) t->flag |= T_RELEASE_CONFIRM; } } - else - { - if (U.flag & USER_RELEASECONFIRM) - { + else { + if (U.flag & USER_RELEASECONFIRM) { t->flag |= T_RELEASE_CONFIRM; } } @@ -1181,22 +1174,18 @@ int initTransInfo (bContext *C, TransInfo *t, wmOperator *op, wmEvent *event) break; } } - else - { + else { /* use settings from scene only if modal */ - if (t->flag & T_MODAL) - { - if ((t->options & CTX_NO_PET) == 0) - { - if (t->obedit && ts->proportional != PROP_EDIT_OFF) - { + if (t->flag & T_MODAL) { + if ((t->options & CTX_NO_PET) == 0) { + if (t->obedit && ts->proportional != PROP_EDIT_OFF) { t->flag |= T_PROP_EDIT; - if(ts->proportional == PROP_EDIT_CONNECTED) + if (ts->proportional == PROP_EDIT_CONNECTED) { t->flag |= T_PROP_CONNECTED; + } } - else if (t->obedit == NULL && ts->proportional_objects) - { + else if (t->obedit == NULL && ts->proportional_objects) { t->flag |= T_PROP_EDIT; } } @@ -1207,8 +1196,7 @@ int initTransInfo (bContext *C, TransInfo *t, wmOperator *op, wmEvent *event) { t->prop_size = RNA_float_get(op->ptr, "proportional_size"); } - else - { + else { t->prop_size = ts->proportional_size; } @@ -1224,8 +1212,7 @@ int initTransInfo (bContext *C, TransInfo *t, wmOperator *op, wmEvent *event) { t->prop_mode = RNA_enum_get(op->ptr, "proportional_edit_falloff"); } - else - { + else { t->prop_mode = ts->prop_mode; } } |