blender
/
blender
135
420
Fork 603
Code Issues 6.3k Pull Requests 754 Projects 19 Wiki Activity

Fix #111504: Regression: Mesh draw corruption in sculpt mode #111521

Merged
Sergey Sharybin merged 3 commits from Sergey/blender:fix_111504 into main 2023-08-25 17:58:42 +02:00
Conversation 3 Commits 3 Files Changed 1 +5 -5
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/draw/intern/draw_pbvh.cc
View File

@ -512,7 +512,7 @@ struct PBVHBatches {
foreach_grids([&](int /*x*/, int /*y*/, int /*grid_index*/, CCGElem *elems[4], int i) {
float *mask = CCG_elem_mask(&args.ccg_key, elems[i]);
*static_cast<uchar *>(GPU_vertbuf_raw_step(&access)) = uchar(*mask * 255.0f);
*static_cast<float *>(GPU_vertbuf_raw_step(&access)) = *mask;
Hans Goudey commented 2023-08-25 15:55:49 +02:00
Outdated
Review
Copy Link

static_cast<float *> now.

Could even use indices or raw pointer increment now though, to avoid the overhead of GPU_vertbuf_raw_step, (which I measured to be significant actually!). That could be done later too though.

`static_cast<float *>` now. Could even use indices or raw pointer increment now though, to avoid the overhead of `GPU_vertbuf_raw_step`, (which I measured to be significant actually!). That could be done later too though.
});
}
else {
@ -648,10 +648,10 @@ struct PBVHBatches {
if (const float *mask = static_cast<const float *>(
CustomData_get_layer(args.vert_data, CD_PAINT_MASK)))
{
extract_data_vert_faces<float, uchar>(args, {mask, args.me->totvert}, vert_buf);
extract_data_vert_faces<float, float>(args, {mask, args.me->totvert}, vert_buf);
}
else {
MutableSpan(static_cast<uchar *>(GPU_vertbuf_get_data(vbo.vert_buf)), totvert).fill(0);
MutableSpan(static_cast<float *>(GPU_vertbuf_get_data(vbo.vert_buf)), totvert).fill(0);
}
break;
}
@ -814,7 +814,7 @@ struct PBVHBatches {
foreach_bmesh([&](BMLoop *l) {
float mask = BM_ELEM_CD_GET_FLOAT(l->v, cd_mask);
*static_cast<uchar *>(GPU_vertbuf_raw_step(&access)) = uchar(mask * 255.0f);
*static_cast<float *>(GPU_vertbuf_raw_step(&access)) = mask;
Hans Goudey commented 2023-08-25 15:56:15 +02:00
Outdated
Review
Copy Link

static_cast<float *>

`static_cast<float *>`
});
}
break;
@ -876,7 +876,7 @@ struct PBVHBatches {
GPU_vertformat_attr_add(&format, "fset", GPU_COMP_U8, 3, GPU_FETCH_INT_TO_FLOAT_UNIT);
break;
case CD_PBVH_MASK_TYPE:
GPU_vertformat_attr_add(&format, "msk", GPU_COMP_U8, 1, GPU_FETCH_INT_TO_FLOAT_UNIT);
GPU_vertformat_attr_add(&format, "msk", GPU_COMP_F32, 1, GPU_FETCH_FLOAT);
break;
case CD_PROP_FLOAT:
GPU_vertformat_attr_add(&format, "f", GPU_COMP_F32, 1, GPU_FETCH_FLOAT);