Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2012-11-08 18:01:47 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2012-11-08 18:01:47 +0400
commiteacc74ef1bdb331cba34817db298f36c957d06d8 (patch)
tree319a69e8f2019b86bbdd0124c50ede737a262e8a /source/blender/blenkernel/intern/subsurf_ccg.c
parent2e52bdbbee3e0e6a501c625e6a0271097d911b27 (diff)
Fix #33116: Blender Crashes when saving inside Sculpt Mode with with GLSL and textured view enabled.
Issue was caused by call ED_sculpt_force_update from WM_file_write which frees derived mesh and pBVH and forces them to be re-created. After this sculpt session wasn't repairing properly. Freeing data from WM_file_write is not nice by itself, but it exposed possible real issue when sculpting on modifiers. Made it so BLI_pbvh_grids_update will update pointers to material flags and hidden grids as well. This isn't idea solution for particular circumstances from the report, since pBVH would be rebuilt after save which ends up with small interface lags for while pBVH is rebuilding. Would be nice to have multires displacement propagation to higher levels without freeing data.
Diffstat (limited to 'source/blender/blenkernel/intern/subsurf_ccg.c')
-rw-r--r--source/blender/blenkernel/intern/subsurf_ccg.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c
index 8a669b89907..be8b572417e 100644
--- a/source/blender/blenkernel/intern/subsurf_ccg.c
+++ b/source/blender/blenkernel/intern/subsurf_ccg.c
@@ -3025,7 +3025,8 @@ static struct PBVH *ccgDM_getPBVH(Object *ob, DerivedMesh *dm)
* when the ccgdm gets remade, the assumption is that the topology
* does not change. */
ccgdm_create_grids(dm);
- BLI_pbvh_grids_update(ob->sculpt->pbvh, ccgdm->gridData, ccgdm->gridAdjacency, (void **)ccgdm->gridFaces);
+ BLI_pbvh_grids_update(ob->sculpt->pbvh, ccgdm->gridData, ccgdm->gridAdjacency, (void **)ccgdm->gridFaces,
+ ccgdm->gridFlagMats, ccgdm->gridHidden);
}
ccgdm->pbvh = ob->sculpt->pbvh;