diff options
| author | Falk David <falkdavid@gmx.de> | 2021-04-28 17:30:20 +0300 |
|---|---|---|
| committer | Falk David <falkdavid@gmx.de> | 2021-04-28 17:30:20 +0300 |
| commit | 67a52c8a4065f32a57d946524a4fab1d2ba92512 (patch) | |
| tree | 116e8e08cd9f6e94b4a1daeeafd552b0a51f7be5 /source/blender/editors/transform | |
| parent | 11dc674c78b49fc4e0b7c134c375b6c8b8eacbcc (diff) | |
| parent | e0fa295bc6f2f99f5679a4d423818d83c67628a2 (diff) | |
Merge branch 'blender-v2.93-release'
Diffstat (limited to 'source/blender/editors/transform')
| -rw-r--r-- | source/blender/editors/transform/transform_convert_gpencil.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/source/blender/editors/transform/transform_convert_gpencil.c b/source/blender/editors/transform/transform_convert_gpencil.c index 45df0e66691..4932a5f8d23 100644 --- a/source/blender/editors/transform/transform_convert_gpencil.c +++ b/source/blender/editors/transform/transform_convert_gpencil.c @@ -78,14 +78,12 @@ static short get_bezt_sel_triple_flag(BezTriple *bezt, const bool handles_visibl flag = ((bezt->f1 & SELECT) ? SEL_F1 : 0) | ((bezt->f2 & SELECT) ? SEL_F2 : 0) | ((bezt->f3 & SELECT) ? SEL_F3 : 0); } - else { - if (bezt->f2 & SELECT) { - flag = SEL_ALL; - } + else if (bezt->f2 & SELECT) { + flag = SEL_ALL; } /* Special case for auto & aligned handles */ - if (flag != SEL_ALL && flag & SEL_F2) { + if ((flag != SEL_ALL) && (flag & SEL_F2)) { if (ELEM(bezt->h1, HD_AUTO, HD_ALIGN) && ELEM(bezt->h2, HD_AUTO, HD_ALIGN)) { flag = SEL_ALL; } @@ -316,7 +314,7 @@ static void createTransGPencil_curves(bContext *C, } } else if (handles_visible) { - if (BEZT_ISSEL_IDX(bezt, j)) { + if (sel) { td->flag = TD_SELECTED; } else { |