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

Curves: cage overlay for sculpt mode #104467

Merged
Jacques Lucke merged 44 commits from JacquesLucke/blender:sculpt-edit-overlay into main 2023-02-14 18:10:24 +01:00
Conversation 0 Commits 44 Files Changed 11 +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 5b0bc9a7af - Show all commits

2
source/blender/draw/engines/overlay/shaders/infos/overlay_sculpt_curves_info.hh
View File

@ -28,7 +28,7 @@ GPU_SHADER_INTERFACE_INFO(overlay_varying_color_wire_iface, "")
GPU_SHADER_CREATE_INFO(overlay_varying_color_wire)
.do_static_compilation(true)
.vertex_in(0, Type::VEC3, "pos")
.vertex_in(1, Type::VEC4, "my_color")
.vertex_in(1, Type::VEC4, "color")
.vertex_out(overlay_varying_color_wire_iface)
.fragment_out(0, Type::VEC4, "fragColor")
.fragment_out(1, Type::VEC4, "lineOutput")

2
source/blender/draw/engines/overlay/shaders/overlay_varying_color_wire_vert.glsl
View File

@ -7,7 +7,7 @@ void main()
vec3 world_pos = point_object_to_world(pos);
gl_Position = point_world_to_ndc(world_pos);
finalColor = my_color;
finalColor = color;
finalColor.a *= opacity;
/* Convert to screen position [0..sizeVp]. */

2
source/blender/draw/intern/draw_cache_impl_curves.cc
View File

@ -809,7 +809,7 @@ void DRW_curves_batch_cache_create_requested(Object *ob)
if (DRW_vbo_requested(cage_cache.cage_point_color)) {
static const GPUVertFormat format = [&]() {
GPUVertFormat format;
GPU_vertformat_attr_add(&format, "my_color", GPU_COMP_U8, 4, GPU_FETCH_INT_TO_FLOAT_UNIT);
GPU_vertformat_attr_add(&format, "color", GPU_COMP_U8, 4, GPU_FETCH_INT_TO_FLOAT_UNIT);
return format;
}();