blender
/
blender
136
406
Fork 590
Code Issues 6.2k Pull Requests 758 Projects 19 Wiki Activity

Merge branch 'blender-v3.0-release'

This commit is contained in:
Germano Cavalcante 2021-11-03 10:23:55 -03:00
parent 3532da44ee f81190f85f
commit 04d35f9315
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/editors/gpencil/gpencil_paint.c
View File

@ -1582,10 +1582,12 @@ static void gpencil_stroke_eraser_dostroke(tGPsdata *p,
*/
if (gpencil_stroke_inside_circle(mval, radius, pc0[0], pc0[1], pc2[0], pc2[1])) {
bool is_occluded_pt0, is_occluded_pt1, is_occluded_pt2 = true;
is_occluded_pt0 = (pt0 && ((pt0->flag & GP_SPOINT_TEMP_TAG) != 0)) ?
((pt0->flag & GP_SPOINT_TEMP_TAG2) != 0) :
gpencil_stroke_eraser_is_occluded(p, gpl, pt0, pc0[0], pc0[1]);
bool is_occluded_pt0 = true, is_occluded_pt1 = true, is_occluded_pt2 = true;
if (pt0) {
is_occluded_pt0 = ((pt0->flag & GP_SPOINT_TEMP_TAG) != 0) ?
((pt0->flag & GP_SPOINT_TEMP_TAG2) != 0) :
gpencil_stroke_eraser_is_occluded(p, gpl, pt0, pc0[0], pc0[1]);
}
if (is_occluded_pt0) {
is_occluded_pt1 = ((pt1->flag & GP_SPOINT_TEMP_TAG) != 0) ?
((pt1->flag & GP_SPOINT_TEMP_TAG2) != 0) :