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

2
source/blender/editors/gpencil/annotate_draw.c
View File

@ -279,7 +279,7 @@ static void annotation_draw_stroke_point(const bGPDspoint *points,
immBindBuiltinProgram(GPU_SHADER_3D_POINT_UNIFORM_SIZE_UNIFORM_COLOR_AA); immBindBuiltinProgram(GPU_SHADER_3D_POINT_UNIFORM_SIZE_UNIFORM_COLOR_AA);
} }
else { else {
immBindBuiltinProgram(GPU_SHADER_2D_POINT_UNIFORM_SIZE_UNIFORM_COLOR_AA); immBindBuiltinProgram(GPU_SHADER_3D_POINT_UNIFORM_SIZE_UNIFORM_COLOR_AA);
/* get 2D coordinates of point */ /* get 2D coordinates of point */
float co[3] = {0.0f}; float co[3] = {0.0f};

2
source/blender/editors/sculpt_paint/curves_sculpt_ops.cc
View File

@ -966,7 +966,7 @@ static void min_distance_edit_draw(bContext *C, int /*x*/, int /*y*/, void *cust
const uint pos3d = GPU_vertformat_attr_add(format3d, "pos", GPU_COMP_F32, 3, GPU_FETCH_FLOAT); const uint pos3d = GPU_vertformat_attr_add(format3d, "pos", GPU_COMP_F32, 3, GPU_FETCH_FLOAT);
const uint col3d = GPU_vertformat_attr_add(format3d, "color", GPU_COMP_F32, 4, GPU_FETCH_FLOAT); const uint col3d = GPU_vertformat_attr_add(format3d, "color", GPU_COMP_F32, 4, GPU_FETCH_FLOAT);
immBindBuiltinProgram(GPU_SHADER_2D_POINT_UNIFORM_SIZE_UNIFORM_COLOR_AA); immBindBuiltinProgram(GPU_SHADER_3D_POINT_UNIFORM_SIZE_UNIFORM_COLOR_AA);
immUniform1f("size", 4.0f); immUniform1f("size", 4.0f);
immBegin(GPU_PRIM_POINTS, points_wo.size()); immBegin(GPU_PRIM_POINTS, points_wo.size());

2
source/blender/editors/space_view3d/view3d_draw.cc
View File

@ -1104,7 +1104,7 @@ static void draw_rotation_guide(const RegionView3D *rv3d)
immUnbindProgram(); immUnbindProgram();
/* -- draw rotation center -- */ /* -- draw rotation center -- */
immBindBuiltinProgram(GPU_SHADER_2D_POINT_UNIFORM_SIZE_UNIFORM_COLOR_AA); immBindBuiltinProgram(GPU_SHADER_3D_POINT_UNIFORM_SIZE_UNIFORM_COLOR_AA);
immUniform1f("size", 7.0f); immUniform1f("size", 7.0f);
immBegin(GPU_PRIM_POINTS, 1); immBegin(GPU_PRIM_POINTS, 1);
immAttr4ubv(col, color); immAttr4ubv(col, color);