[Bf-blender-cvs] [88efbf7d1ec] sculpt-dev: Sculpt: fix multi-res crash
Joseph Eagar
noreply at git.blender.org
Wed Oct 6 12:11:18 CEST 2021
Commit: 88efbf7d1ec6982fd6805d92d22fc870fd5ba71b
Author: Joseph Eagar
Date: Wed Oct 6 03:10:57 2021 -0700
Branches: sculpt-dev
https://developer.blender.org/rB88efbf7d1ec6982fd6805d92d22fc870fd5ba71b
Sculpt: fix multi-res crash
===================================================================
M source/blender/blenkernel/intern/paint.c
===================================================================
diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c
index 7b2f41f82b1..efafa1723a6 100644
--- a/source/blender/blenkernel/intern/paint.c
+++ b/source/blender/blenkernel/intern/paint.c
@@ -1836,6 +1836,22 @@ static void sculpt_update_object(Depsgraph *depsgraph,
}
}
}
+
+ int totvert = 0;
+
+ switch (BKE_pbvh_type(pbvh)) {
+ case PBVH_FACES:
+ totvert = me->totvert;
+ break;
+ case PBVH_BMESH:
+ totvert = ss->bm ? ss->bm->totvert : me->totvert;
+ break;
+ case PBVH_GRIDS:
+ totvert = BKE_pbvh_get_grid_num_vertices(ss->pbvh);
+ break;
+ }
+
+ BKE_sculptsession_check_mdyntopo(ob->sculpt, pbvh, totvert);
}
void BKE_sculpt_update_object_before_eval(Object *ob)
@@ -2311,6 +2327,8 @@ bool BKE_sculptsession_check_mdyntopo(SculptSession *ss, PBVH *pbvh, int totvert
return true;
}
+ BKE_pbvh_set_mdyntopo_verts(pbvh, ss->mdyntopo_verts);
+
return false;
}
More information about the Bf-blender-cvs
mailing list