Chris_Blackbourn/blender
0
0
Fork 0
forked from blender/blender
Code Pull Requests 1 Activity

WIP: uv-simple-select #1

Closed
Chris Blackbourn wants to merge 182 commits from uv-simple-select into main
pull from: uv-simple-select
merge into: Chris_Blackbourn:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 0 Commits 182 Files Changed 881 +16 -9
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c1d2081e6d - Show all commits

9
source/blender/editors/gpencil/gpencil_fill.c
View File

@ -917,6 +917,7 @@ static void gpencil_draw_basic_stroke(tGPDfill *tgpf,
const bool is_line_mode = (tgpf->fill_extend_mode == GP_FILL_EMODE_EXTEND); const bool is_line_mode = (tgpf->fill_extend_mode == GP_FILL_EMODE_EXTEND);
const bool use_stroke_collide = (tgpf->flag & GP_BRUSH_FILL_STROKE_COLLIDE) != 0; const bool use_stroke_collide = (tgpf->flag & GP_BRUSH_FILL_STROKE_COLLIDE) != 0;
const bool stroke_collide = (gps->flag & GP_STROKE_COLLIDE) != 0; const bool stroke_collide = (gps->flag & GP_STROKE_COLLIDE) != 0;
bool circle_contact = false;
if (!gpencil_stroke_is_drawable(tgpf, gps)) { if (!gpencil_stroke_is_drawable(tgpf, gps)) {
return; return;
@ -933,7 +934,11 @@ static void gpencil_draw_basic_stroke(tGPDfill *tgpf,
/* If there is contact, hide the circles to avoid noise and keep the focus /* If there is contact, hide the circles to avoid noise and keep the focus
* in the pending gaps. */ * in the pending gaps. */
col[3] = (gps->flag & GP_STROKE_TAG) ? 0.0f : 0.5f; col[3] = 0.5f;
if (gps->flag & GP_STROKE_TAG) {
circle_contact = true;
col[3] = 0.0f;
}
} }
else if ((is_extend) && (!tgpf->is_render)) { else if ((is_extend) && (!tgpf->is_render)) {
if (stroke_collide || !use_stroke_collide || !is_line_mode) { if (stroke_collide || !use_stroke_collide || !is_line_mode) {
@ -962,6 +967,7 @@ static void gpencil_draw_basic_stroke(tGPDfill *tgpf,
for (int i = 0; i < totpoints; i++, pt++) { for (int i = 0; i < totpoints; i++, pt++) {
if (!circle_contact) {
/* This flag is inverted in the UI. */ /* This flag is inverted in the UI. */
if ((flag & GP_BRUSH_FILL_HIDE) == 0) { if ((flag & GP_BRUSH_FILL_HIDE) == 0) {
float alpha = gp_style->stroke_rgba[3] * pt->strength; float alpha = gp_style->stroke_rgba[3] * pt->strength;
@ -971,6 +977,7 @@ static void gpencil_draw_basic_stroke(tGPDfill *tgpf,
else if (!is_help) { else if (!is_help) {
col[3] = 1.0f; col[3] = 1.0f;
} }
}
/* set point */ /* set point */
immAttr4fv(color, col); immAttr4fv(color, col);
mul_v3_m4v3(fpt, diff_mat, &pt->x); mul_v3_m4v3(fpt, diff_mat, &pt->x);