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>2018-12-06 17:20:16 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2018-12-06 17:22:21 +0300
commitc8467ccc8df3a2d7fc161d227517361647ba83fc (patch)
tree226f69c0116c18f8f244eaf890417c6f7ab7e782 /source/blender/blenkernel/intern/multires_reshape.c
parentb0726b31e6df9b316d20363298a3f919bd7d408b (diff)
Fix T58310: Crash when removing multires modifier from sculpt object
Diffstat (limited to 'source/blender/blenkernel/intern/multires_reshape.c')
-rw-r--r--source/blender/blenkernel/intern/multires_reshape.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/multires_reshape.c b/source/blender/blenkernel/intern/multires_reshape.c
index 72be2617798..af3219ca06c 100644
--- a/source/blender/blenkernel/intern/multires_reshape.c
+++ b/source/blender/blenkernel/intern/multires_reshape.c
@@ -1163,6 +1163,11 @@ bool multiresModifier_reshapeFromCCG(
return false;
}
MDisps *mdisps = CustomData_get_layer(&coarse_mesh->ldata, CD_MDISPS);
+ if (mdisps == NULL) {
+ /* Multires displacement has been removed before current changes were
+ * applies to all the levels. */
+ return false;
+ }
GridPaintMask *grid_paint_mask =
CustomData_get_layer(&coarse_mesh->ldata, CD_GRID_PAINT_MASK);
Subdiv *subdiv = subdiv_ccg->subdiv;