[Bf-blender-cvs] [3c089c0a889] master: Sculpt: Fix T102209: Multiresolution levels greater than 6 crashes

[Joseph Eagar]

Commit: 3c089c0a88983b6fcd5ebed7480625fc4c1bf8a8
Author: Joseph Eagar
Date:   Thu Nov 10 11:30:04 2022 -0800
Branches: master
https://developer.blender.org/rB3c089c0a88983b6fcd5ebed7480625fc4c1bf8a8

Sculpt: Fix T102209: Multiresolution levels greater than 6 crashes

pbvh->leaf_limit needs to be at least 4 to split nodes
original face boundaries properly.

===================================================================

M	source/blender/blenkernel/intern/pbvh.c

===================================================================

diff --git a/source/blender/blenkernel/intern/pbvh.c b/source/blender/blenkernel/intern/pbvh.c
index 98e89b09060..24ea2de98f6 100644
--- a/source/blender/blenkernel/intern/pbvh.c
+++ b/source/blender/blenkernel/intern/pbvh.c
@@ -833,7 +833,12 @@ void BKE_pbvh_build_grids(PBVH *pbvh,
   pbvh->gridkey = *key;
   pbvh->grid_hidden = grid_hidden;
   pbvh->subdiv_ccg = subdiv_ccg;
-  pbvh->leaf_limit = max_ii(LEAF_LIMIT / (gridsize * gridsize), 1);
+
+  /* Ensure leaf limit is at least 4 so there's room
+   * to split at original face boundaries.
+   * Fixes T102209.
+   */
+  pbvh->leaf_limit = max_ii(LEAF_LIMIT / (gridsize * gridsize), 4);
 
   /* We need the base mesh attribute layout for PBVH draw. */
   pbvh->vdata = &me->vdata;