blender
/
blender
136
405
Fork 586
Code Issues 6.2k Pull Requests 755 Projects 19 Wiki Activity

Sculpt-dev: Fix more crashes from recent merge 

* Fixed crashes in color attribute system
* Fixed mask related crash.
* Removed dead code.
This commit is contained in:
Joseph Eagar 2022-04-11 21:59:38 -07:00
parent ed550e1da9
commit f0c2994b02
6 changed files with 69 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
source/blender/blenkernel/intern/pbvh.c
View File

@ -788,9 +788,6 @@ PBVH *BKE_pbvh_new(void)
PBVH *pbvh = MEM_callocN(sizeof(PBVH), "pbvh");
pbvh->respect_hide = true;
pbvh->vcol_type = -1;
pbvh->vcol_domain = ATTR_DOMAIN_NUM;
return pbvh;
}
@ -1435,9 +1432,9 @@ bool BKE_pbvh_get_color_layer(const Mesh *me, CustomDataLayer **r_layer, Attribu
return true;
}
static void pbvh_update_draw_buffer_cb(void *__restrict userdata,
const int n,
const TaskParallelTLS *__restrict UNUSED(tls))
ATTR_NO_OPT static void pbvh_update_draw_buffer_cb(void *__restrict userdata,
const int n,
const TaskParallelTLS *__restrict UNUSED(tls))
{
/* Create and update draw buffers. The functions called here must not
* do any OpenGL calls. Flags are not cleared immediately, that happens
@ -1585,9 +1582,9 @@ static void pbvh_update_draw_buffer_cb(void *__restrict userdata,
.face_sets_color_default = pbvh->face_sets_color_default,
.flat_vcol = data->flat_vcol_shading,
.mat_nr = node->tri_buffers[i].mat_nr,
.active_vcol_domain = pbvh->vcol_domain,
.active_vcol_type = pbvh->vcol_type,
.active_vcol_layer = vcol_layer,
.active_vcol_domain = pbvh->color_domain,
.active_vcol_type = pbvh->color_type,
.active_vcol_layer = pbvh->color_layer,
.render_vcol_layer = render_vcol_layer};
GPU_pbvh_bmesh_buffers_update(&args);
@ -1673,34 +1670,21 @@ static void pbvh_update_draw_buffers(
ldata = &me->ldata;
}
Mesh me_query;
BKE_id_attribute_copy_domains_temp(ID_ME, vdata, NULL, ldata, NULL, NULL, &me_query.id);
CustomDataLayer *vcol_layer = NULL;
AttributeDomain domain;
BKE_pbvh_get_color_layer(me, &vcol_layer, &domain);
CustomDataLayer *render_vcol_layer = BKE_id_attributes_render_color_get((ID *)me);
if (pbvh->bm && render_vcol_layer) {
AttributeDomain domain = BKE_id_attribute_domain((ID *)me, render_vcol_layer);
CustomData *cdata = domain == ATTR_DOMAIN_POINT ? &pbvh->bm->vdata : &pbvh->bm->ldata;
int idx = CustomData_get_named_layer_index(
cdata, render_vcol_layer->type, render_vcol_layer->name);
if (idx == -1) {
render_vcol_layer = NULL; /* layer hasn't been synced over yet */
}
else {
render_vcol_layer = cdata->layers + idx;
}
}
BKE_pbvh_get_color_layer(&me_query, &vcol_layer, &domain);
CustomDataLayer *render_vcol_layer = BKE_id_attributes_render_color_get(&me_query.id);
/* rebuild all draw buffers if attribute layout changed */
if (GPU_pbvh_update_attribute_names(vdata,
ldata,
GPU_pbvh_need_full_render_get(),
pbvh->flags & PBVH_FAST_DRAW,
pbvh->vcol_type,
pbvh->vcol_domain,
pbvh->color_type,
pbvh->color_domain,
vcol_layer,
render_vcol_layer,
!GPU_pbvh_need_full_render_get())) {
@ -4270,7 +4254,7 @@ void BKE_pbvh_check_tri_areas(PBVH *pbvh, PBVHNode *node)
switch (BKE_pbvh_type(pbvh)) {
case PBVH_FACES: {
for (int i = 0; i < node->totprim; i++) {
for (int i = 0; i < (int)node->totprim; i++) {
const MLoopTri *lt = &pbvh->looptri[node->prim_indices[i]];
if (pbvh->face_sets[lt->poly] < 0) {
@ -4281,7 +4265,7 @@ void BKE_pbvh_check_tri_areas(PBVH *pbvh, PBVHNode *node)
pbvh->face_areas[lt->poly * 2 + cur_i] = 0.0f;
}
for (int i = 0; i < node->totprim; i++) {
for (int i = 0; i < (int)node->totprim; i++) {
const MLoopTri *lt = &pbvh->looptri[node->prim_indices[i]];
if (pbvh->face_sets[lt->poly] < 0) {
@ -4835,7 +4819,7 @@ bool BKE_pbvh_cache_is_valid(const struct Object *ob,
}
bool ok = true;
int totvert, totedge, totloop, totpoly;
int totvert = 0, totedge = 0, totloop = 0, totpoly = 0;
const CustomData *vdata, *edata, *ldata, *pdata;
switch (pbvh_type) {
@ -5185,10 +5169,27 @@ void BKE_pbvh_update_active_vcol(PBVH *pbvh, const Mesh *mesh)
{
CustomDataLayer *last_layer = pbvh->color_layer;
BKE_pbvh_get_color_layer(mesh, &pbvh->color_layer, &pbvh->color_domain);
Mesh me_query;
const CustomData *vdata, *ldata;
if (pbvh->type == PBVH_BMESH && pbvh->bm) {
vdata = &pbvh->bm->vdata;
ldata = &pbvh->bm->ldata;
}
else {
vdata = &mesh->vdata;
ldata = &mesh->ldata;
}
BKE_id_attribute_copy_domains_temp(ID_ME, vdata, NULL, ldata, NULL, NULL, &me_query.id);
BKE_pbvh_get_color_layer(&me_query, &pbvh->color_layer, &pbvh->color_domain);
if (pbvh->color_layer) {
pbvh->color_type = pbvh->color_layer->type;
if (pbvh->bm) {
pbvh->cd_vcol_offset = pbvh->color_layer->offset;
}
}
if (pbvh->color_layer != last_layer) {
@ -5241,7 +5242,7 @@ void BKE_pbvh_ensure_node_loops(PBVH *pbvh)
node->loop_indices = MEM_malloc_arrayN(node->totprim * 3, sizeof(int), __func__);
node->loop_indices_num = 0;
for (int j = 0; j < node->totprim; j++) {
for (int j = 0; j < (int)node->totprim; j++) {
const MLoopTri *mlt = pbvh->looptri + node->prim_indices[j];
for (int k = 0; k < 3; k++) {
@ -5268,10 +5269,12 @@ bool BKE_pbvh_get_origvert(
if (mv->stroke_id != pbvh->stroke_id) {
mv->stroke_id = pbvh->stroke_id;
float *mask = NULL;
if (pbvh->type == PBVH_FACES) {
copy_v3_v3(mv->origco, pbvh->verts[vertex.i].co);
copy_v3_v3(mv->origno, pbvh->vert_normals[vertex.i]);
mask = (float *)CustomData_get_layer(pbvh->vdata, CD_PAINT_MASK);
}
else {
const CCGKey *key = BKE_pbvh_get_grid_key(pbvh);
@ -5281,12 +5284,11 @@ bool BKE_pbvh_get_origvert(
copy_v3_v3(mv->origco, CCG_elem_co(key, CCG_elem_offset(key, elem, vertex_index)));
copy_v3_v3(mv->origno, CCG_elem_no(key, CCG_elem_offset(key, elem, vertex_index)));
mask = CCG_elem_mask(key, CCG_elem_offset(key, elem, vertex_index));
}
float *mask = (float *)CustomData_get_layer(pbvh->vdata, CD_PAINT_MASK);
if (mask) {
mv->origmask = mask[vertex.i];
mv->origmask = (ushort)(mask[vertex.i] * 65535.0f);
}
if (pbvh->color_layer) {

3
source/blender/blenkernel/intern/pbvh_intern.h
View File

@ -217,9 +217,6 @@ struct PBVH {
int totuv;
int vcol_type;
int vcol_domain;
float planes[6][4];
int num_planes;

4
source/blender/editors/sculpt_paint/sculpt_dyntopo.c
View File

@ -719,7 +719,9 @@ void SCULPT_dynamic_topology_enable_ex(Main *bmain, Depsgraph *depsgraph, Scene
e->head.hflag |= BM_ELEM_DRAW;
}
BKE_pbvh_update_sculpt_verts(ss->pbvh);
if (ss->pbvh) {
BKE_pbvh_update_sculpt_verts(ss->pbvh);
}
/* Make sure the data for existing faces are initialized. */
if (me->totpoly != ss->bm->totface) {

2
source/blender/editors/sculpt_paint/sculpt_ops.c
View File

@ -654,7 +654,7 @@ static bool sculpt_sample_color_update_from_base(bContext *C,
return true;
}
static int sculpt_sample_color_modal(bContext *C, wmOperator *op, const wmEvent *event)
ATTR_NO_OPT static int sculpt_sample_color_modal(bContext *C, wmOperator *op, const wmEvent *event)
{
ARegion *region = CTX_wm_region(C);
Sculpt *sd = CTX_data_tool_settings(C)->sculpt;

4
source/blender/editors/transform/transform_snap_object.cc
View File

@ -1003,7 +1003,7 @@ struct RaycastObjUserData {
/**
* \note Duplicate args here are documented at #snapObjectsRay
*/
static void raycast_obj_fn(SnapObjectContext *sctx,
ATTR_NO_OPT static void raycast_obj_fn(SnapObjectContext *sctx,
const struct SnapObjectParams *params,
Object *ob_eval,
const float obmat[4][4],
@ -2489,7 +2489,7 @@ static short snapMesh(SnapObjectContext *sctx,
return 0;
}
static short snapEditMesh(SnapObjectContext *sctx,
ATTR_NO_OPT static short snapEditMesh(SnapObjectContext *sctx,
const struct SnapObjectParams *params,
Object *ob_eval,
BMEditMesh *em,

48
source/blender/gpu/intern/gpu_buffers.c
View File

@ -238,22 +238,22 @@ static bool gpu_pbvh_is_looptri_visible(const MLoopTri *lt,
sculpt_face_sets[lt->poly] > SCULPT_FACE_SET_NONE);
}
ATTR_NO_OPT void GPU_pbvh_mesh_buffers_update(GPU_PBVH_Buffers *buffers,
const MVert *mvert,
const MLoop *mloop,
const MPoly *mpoly,
const MLoopTri *looptri,
const CustomData *vdata,
const CustomData *ldata,
const float *vmask,
const CustomDataLayer *active_vcol_layer,
const CustomDataLayer *render_vcol_layer,
const AttributeDomain active_vcol_domain,
const int *sculpt_face_sets,
const int face_sets_color_seed,
const int face_sets_color_default,
const int update_flags,
const float (*vert_normals)[3])
void GPU_pbvh_mesh_buffers_update(GPU_PBVH_Buffers *buffers,
const MVert *mvert,
const MLoop *mloop,
const MPoly *mpoly,
const MLoopTri *looptri,
const CustomData *vdata,
const CustomData *ldata,
const float *vmask,
const CustomDataLayer *active_vcol_layer,
const CustomDataLayer *render_vcol_layer,
const AttributeDomain active_vcol_domain,
const int *sculpt_face_sets,
const int face_sets_color_seed,
const int face_sets_color_default,
const int update_flags,
const float (*vert_normals)[3])
{
GPUAttrRef vcol_refs[MAX_GPU_ATTR];
GPUAttrRef cd_uvs[MAX_GPU_ATTR];
@ -484,14 +484,14 @@ ATTR_NO_OPT void GPU_pbvh_mesh_buffers_update(GPU_PBVH_Buffers *buffers,
buffers->mvert = mvert;
}
ATTR_NO_OPT GPU_PBVH_Buffers *GPU_pbvh_mesh_buffers_build(const MPoly *mpoly,
const MLoop *mloop,
const MLoopTri *looptri,
const MVert *mvert,
const int *face_indices,
const int *sculpt_face_sets,
const int face_indices_len,
const struct Mesh *mesh)
GPU_PBVH_Buffers *GPU_pbvh_mesh_buffers_build(const MPoly *mpoly,
const MLoop *mloop,
const MLoopTri *looptri,
const MVert *mvert,
const int *face_indices,
const int *sculpt_face_sets,
const int face_indices_len,
const struct Mesh *mesh)
{
GPU_PBVH_Buffers *buffers;
int i, tottri;