From 769c5bade5f31bfa9d0631c9d60d2a70434ecbc3 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 12 Sep 2013 08:28:41 +0000 Subject: fix [#36299] Skin Modifier causes crashes in combination with multiple Subdivision modifiers --- source/blender/blenkernel/intern/DerivedMesh.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index 359141b2c8c..5809e48e6cd 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -2086,10 +2086,16 @@ static void editbmesh_calc_modifiers(Scene *scene, Object *ob, BMEditMesh *em, D mask &= ~CD_MASK_ORCO; DM_set_only_copy(orcodm, mask | CD_MASK_ORIGINDEX); - if (mti->applyModifierEM) + /* disabled: subsurf can't calculate twice on the same editmesh (uses freed cache) [#36299] */ +#if 0 + if (mti->applyModifierEM) { ndm = modwrap_applyModifierEM(md, ob, em, orcodm, MOD_APPLY_ORCO); + } else +#endif + { ndm = modwrap_applyModifier(md, ob, orcodm, MOD_APPLY_ORCO); + } ASSERT_IS_VALID_DM(ndm); if (ndm) { -- cgit v1.2.3