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 +7 -5
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 452522958d - Show all commits

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

@ -993,23 +993,25 @@ static void draw_mouse_position(tGPDfill *tgpf)
if (tgpf->gps_mouse == NULL) { if (tgpf->gps_mouse == NULL) {
return; return;
} }
uchar mouse_color[4] = {0, 0, 255, 255};
bGPDspoint *pt = &tgpf->gps_mouse->points[0]; bGPDspoint *pt = &tgpf->gps_mouse->points[0];
float point_size = (tgpf->zoom == 1.0f) ? 4.0f * tgpf->fill_factor : float point_size = (tgpf->zoom == 1.0f) ? 4.0f * tgpf->fill_factor :
(0.5f * tgpf->zoom) + tgpf->fill_factor; (0.5f * tgpf->zoom) + tgpf->fill_factor;
GPUVertFormat *format = immVertexFormat(); GPUVertFormat *format = immVertexFormat();
uint pos = GPU_vertformat_attr_add(format, "pos", GPU_COMP_F32, 3, GPU_FETCH_FLOAT); uint pos = GPU_vertformat_attr_add(format, "pos", GPU_COMP_F32, 3, GPU_FETCH_FLOAT);
uint col = GPU_vertformat_attr_add(format, "color", GPU_COMP_U8, 4, GPU_FETCH_INT_TO_FLOAT_UNIT); uint size = GPU_vertformat_attr_add(format, "size", GPU_COMP_F32, 1, GPU_FETCH_FLOAT);
uint color = GPU_vertformat_attr_add(format, "color", GPU_COMP_F32, 4, GPU_FETCH_FLOAT);
/* Draw mouse click position in Blue. */ /* Draw mouse click position in Blue. */
immBindBuiltinProgram(GPU_SHADER_2D_POINT_UNIFORM_SIZE_UNIFORM_COLOR_AA); GPU_program_point_size(true);
immUniform1f("size", point_size * M_SQRT2); immBindBuiltinProgram(GPU_SHADER_3D_POINT_VARYING_SIZE_VARYING_COLOR);
immBegin(GPU_PRIM_POINTS, 1); immBegin(GPU_PRIM_POINTS, 1);
immAttr4ubv(col, mouse_color); immAttr1f(size, point_size * M_SQRT2);
immAttr4f(color, 0.0f, 0.0f, 1.0f, 1.0f);
immVertex3fv(pos, &pt->x); immVertex3fv(pos, &pt->x);
immEnd(); immEnd();
immUnbindProgram(); immUnbindProgram();
GPU_program_point_size(false);
} }
/* Helper: Check if must skip the layer */ /* Helper: Check if must skip the layer */