diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-02-18 00:35:03 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-02-18 00:50:02 +0300 |
| commit | 485915115490fc04e4eafbaac66f2917fe932020 (patch) | |
| tree | 04b2b417b1c304668a882da8ffc05b60edb87877 /source/blender/editors | |
| parent | 4bbd1b9610f6d85079ea5bc31fc1949f8409a1a4 (diff) | |
Cleanup: style
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/gpencil/gpencil_paint.c | 6 | ||||
| -rw-r--r-- | source/blender/editors/mesh/editmesh_bevel.c | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c index e151a5988e1..731f85d1bea 100644 --- a/source/blender/editors/gpencil/gpencil_paint.c +++ b/source/blender/editors/gpencil/gpencil_paint.c @@ -2077,11 +2077,13 @@ static void gp_paint_initstroke(tGPsdata *p, eGPencil_PaintModes paintmode, Deps if (p->gpl == NULL) { p->gpl = BKE_gpencil_layer_addnew(p->gpd, DATA_("GP_Layer"), true); - if (p->custom_color[3]) + if (p->custom_color[3]) { copy_v3_v3(p->gpl->color, p->custom_color); + } } if ((paintmode != GP_PAINTMODE_ERASER) && - (p->gpl->flag & GP_LAYER_LOCKED)) { + (p->gpl->flag & GP_LAYER_LOCKED)) + { p->status = GP_STATUS_ERROR; if (G.debug & G_DEBUG) printf("Error: Cannot paint on locked layer\n"); diff --git a/source/blender/editors/mesh/editmesh_bevel.c b/source/blender/editors/mesh/editmesh_bevel.c index 6bb7d1f253a..ee08b81759a 100644 --- a/source/blender/editors/mesh/editmesh_bevel.c +++ b/source/blender/editors/mesh/editmesh_bevel.c @@ -580,7 +580,8 @@ static int edbm_bevel_modal(bContext *C, wmOperator *op, const wmEvent *event) /* When activated from toolbar, need to convert leftmouse release to confirm */ if (etype == LEFTMOUSE && eval == KM_RELEASE && - RNA_boolean_get(op->ptr, "release_confirm")) { + RNA_boolean_get(op->ptr, "release_confirm")) + { etype = EVT_MODAL_MAP; eval = BEV_MODAL_CONFIRM; } |