diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-03-12 00:21:13 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-03-12 00:21:13 +0300 |
commit | fd76b8d8253fe883c3a421862e1efc497954308e (patch) | |
tree | d7482dd5fb5dd48ac6375a9e9abdf76102425fb0 /source/blender/editors/mesh | |
parent | 815a9df70cf1ed1a3dfd7c26869354b07de34404 (diff) |
Cleanup: style
Diffstat (limited to 'source/blender/editors/mesh')
-rw-r--r-- | source/blender/editors/mesh/editmesh_bevel.c | 2 | ||||
-rw-r--r-- | source/blender/editors/mesh/editmesh_inset.c | 6 | ||||
-rw-r--r-- | source/blender/editors/mesh/editmesh_undo.c | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/source/blender/editors/mesh/editmesh_bevel.c b/source/blender/editors/mesh/editmesh_bevel.c index 1b301f8f6eb..0b079fddbfb 100644 --- a/source/blender/editors/mesh/editmesh_bevel.c +++ b/source/blender/editors/mesh/editmesh_bevel.c @@ -623,7 +623,7 @@ static int edbm_bevel_modal(bContext *C, wmOperator *op, const wmEvent *event) } /* Modal numinput active, try to handle numeric inputs first... */ if (etype != EVT_MODAL_MAP && eval == KM_PRESS && has_numinput && - handleNumInput(C, &opdata->num_input[opdata->value_mode], event)) + handleNumInput(C, &opdata->num_input[opdata->value_mode], event)) { edbm_bevel_numinput_set_value(op); edbm_bevel_calc(op); diff --git a/source/blender/editors/mesh/editmesh_inset.c b/source/blender/editors/mesh/editmesh_inset.c index c63f0db1f2b..3b48c4e29b0 100644 --- a/source/blender/editors/mesh/editmesh_inset.c +++ b/source/blender/editors/mesh/editmesh_inset.c @@ -383,12 +383,14 @@ static int edbm_inset_modal(bContext *C, wmOperator *op, const wmEvent *event) mdiff[0] = opdata->mcenter[0] - event->mval[0]; mdiff[1] = opdata->mcenter[1] - event->mval[1]; - if (opdata->modify_depth) + if (opdata->modify_depth) { amount = opdata->old_depth + ((len_v2(mdiff) - opdata->initial_length) * opdata->pixel_size) / opdata->max_obj_scale; - else + } + else { amount = opdata->old_thickness - ((len_v2(mdiff) - opdata->initial_length) * opdata->pixel_size) / opdata->max_obj_scale; + } /* Fake shift-transform... */ if (opdata->shift) diff --git a/source/blender/editors/mesh/editmesh_undo.c b/source/blender/editors/mesh/editmesh_undo.c index e22addd614e..649566e67cb 100644 --- a/source/blender/editors/mesh/editmesh_undo.c +++ b/source/blender/editors/mesh/editmesh_undo.c @@ -509,7 +509,7 @@ static void *undomesh_from_editmesh(UndoMesh *um, BMEditMesh *em, Key *key) NULL, em->bm, &um->me, (&(struct BMeshToMeshParams){ /* Undo code should not be manipulating 'G_MAIN->object' hooks/vertex-parent. */ .calc_object_remap = false, - .cd_mask_extra = {.vmask=CD_MASK_SHAPE_KEYINDEX}, + .cd_mask_extra = {.vmask = CD_MASK_SHAPE_KEYINDEX}, })); um->selectmode = em->selectmode; |