diff options
| author | Jacques Lucke <jacques@blender.org> | 2020-11-19 19:38:48 +0300 |
|---|---|---|
| committer | Jacques Lucke <jacques@blender.org> | 2020-11-19 19:38:48 +0300 |
| commit | bb960c85a55b823ee2c76911992043ac8c4eedda (patch) | |
| tree | c3238b01838796fd128f122cae376fe5335f485c /source/blender/editors/sculpt_paint | |
| parent | eb25446b9d2df9ca1cde808b12105be502adc4d1 (diff) | |
| parent | 72a199e148b20c36a63cdf6c6af067c9bcdb3f92 (diff) | |
Merge branch 'master' into geometry-nodes
Diffstat (limited to 'source/blender/editors/sculpt_paint')
| -rw-r--r-- | source/blender/editors/sculpt_paint/paint_mask.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/sculpt_paint/sculpt_face_set.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_mask.c b/source/blender/editors/sculpt_paint/paint_mask.c index 4dd7ecb09ca..11d897cf76f 100644 --- a/source/blender/editors/sculpt_paint/paint_mask.c +++ b/source/blender/editors/sculpt_paint/paint_mask.c @@ -531,7 +531,7 @@ static SculptGestureContext *sculpt_gesture_init_from_line(bContext *C, wmOperat sgcontext, line_points, plane_points, offset_plane_points); /* Calculate line plane and normal. */ - const bool flip = sgcontext->line.flip ^ !sgcontext->vc.rv3d->is_persp; + const bool flip = sgcontext->line.flip ^ (!sgcontext->vc.rv3d->is_persp); sculpt_gesture_line_plane_from_tri(sgcontext->line.true_plane, sgcontext, flip, diff --git a/source/blender/editors/sculpt_paint/sculpt_face_set.c b/source/blender/editors/sculpt_paint/sculpt_face_set.c index c05dace380a..f67c8f701f7 100644 --- a/source/blender/editors/sculpt_paint/sculpt_face_set.c +++ b/source/blender/editors/sculpt_paint/sculpt_face_set.c @@ -1213,7 +1213,7 @@ static bool sculpt_face_set_edit_is_operation_valid(SculptSession *ss, { if (BKE_pbvh_type(ss->pbvh) == PBVH_BMESH) { /* Dyntopo is not supported. */ - return OPERATOR_CANCELLED; + return false; } if (mode == SCULPT_FACE_SET_EDIT_DELETE_GEOMETRY) { |