diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2020-11-06 04:46:17 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2020-11-06 04:46:17 +0300 |
| commit | d89fedf2667298042ed12a899fb2afe538a69901 (patch) | |
| tree | a6385647dcaac65d030d2b3d50bb3b819137bbb7 /source/blender/editors | |
| parent | aa3a4973a30ff668a62447e18ac41f6c916b4a8b (diff) | |
Cleanup: clang-format
Missed this last commit.
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/curve/editfont.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/sculpt_paint/paint_image.c | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/editors/curve/editfont.c b/source/blender/editors/curve/editfont.c index 13a64ba5071..d6744472c0e 100644 --- a/source/blender/editors/curve/editfont.c +++ b/source/blender/editors/curve/editfont.c @@ -1695,8 +1695,8 @@ static int insert_text_invoke(bContext *C, wmOperator *op, const wmEvent *event) if (event_val && (ascii || event->utf8_buf[0])) { /* handle case like TAB (== 9) */ - if ((ascii > 31 && ascii < 254 && ascii != 127) || (ELEM(ascii, 13, 10)) || - (ascii == 8) || (event->utf8_buf[0])) { + if ((ascii > 31 && ascii < 254 && ascii != 127) || (ELEM(ascii, 13, 10)) || (ascii == 8) || + (event->utf8_buf[0])) { if (accentcode) { if (ef->pos > 0) { diff --git a/source/blender/editors/sculpt_paint/paint_image.c b/source/blender/editors/sculpt_paint/paint_image.c index 2c33c0dbcf6..3a6b91443a0 100644 --- a/source/blender/editors/sculpt_paint/paint_image.c +++ b/source/blender/editors/sculpt_paint/paint_image.c @@ -349,7 +349,8 @@ typedef struct PaintOperation { bool paint_use_opacity_masking(Brush *brush) { return ((brush->flag & BRUSH_AIRBRUSH) || (brush->flag & BRUSH_DRAG_DOT) || - (brush->flag & BRUSH_ANCHORED) || (ELEM(brush->imagepaint_tool, PAINT_TOOL_SMEAR, PAINT_TOOL_SOFTEN)) || + (brush->flag & BRUSH_ANCHORED) || + (ELEM(brush->imagepaint_tool, PAINT_TOOL_SMEAR, PAINT_TOOL_SOFTEN)) || (brush->imagepaint_tool == PAINT_TOOL_FILL) || (brush->flag & BRUSH_USE_GRADIENT) || (brush->mtex.tex && !ELEM(brush->mtex.brush_map_mode, |