diff options
| author | Pablo Dobarro <pablodp606@gmail.com> | 2020-02-10 20:41:03 +0300 |
|---|---|---|
| committer | Pablo Dobarro <pablodp606@gmail.com> | 2020-02-11 18:38:46 +0300 |
| commit | af6ba4dce51136759d27d67a826eafdb421c2c74 (patch) | |
| tree | 08cf33030b8b2233333b17a4a9eceb5a383733eb /source/blender/blenkernel/intern/multires.c | |
| parent | efbe4fd6c299325054c8f430541cf18f03940f64 (diff) | |
Fix T73706: Crash after disabling dyntopo with multires modifier
ss->multires is set in sculpt_update_object, which is not called just
after disabling dyntopo, so it needs to be checked before running
reshapeFromCCG
Reviewed By: campbellbarton, brecht
Maniphest Tasks: T73706
Differential Revision: https://developer.blender.org/D6801
Diffstat (limited to 'source/blender/blenkernel/intern/multires.c')
| -rw-r--r-- | source/blender/blenkernel/intern/multires.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/multires.c b/source/blender/blenkernel/intern/multires.c index 23fa8dd60d5..96608a931ab 100644 --- a/source/blender/blenkernel/intern/multires.c +++ b/source/blender/blenkernel/intern/multires.c @@ -410,7 +410,7 @@ void multires_flush_sculpt_updates(Object *ob) { if (ob && ob->sculpt && ob->sculpt->pbvh != NULL) { SculptSession *sculpt_session = ob->sculpt; - if (BKE_pbvh_type(sculpt_session->pbvh) == PBVH_GRIDS) { + if (BKE_pbvh_type(sculpt_session->pbvh) == PBVH_GRIDS && sculpt_session->multires) { Mesh *mesh = ob->data; multiresModifier_reshapeFromCCG( sculpt_session->multires->totlvl, mesh, sculpt_session->subdiv_ccg); |