From c9dfe7bd74a03886d4284985418619ccf5077ac3 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 12 Sep 2013 10:41:00 +0000 Subject: more localized fix for [#36299], only changes behavior for subsurf with orco in editmode --- source/blender/blenkernel/intern/DerivedMesh.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'source/blender/blenkernel/intern/DerivedMesh.c') diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index 5809e48e6cd..368c1e517ef 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -2086,14 +2086,10 @@ 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); - /* 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 - { + else { ndm = modwrap_applyModifier(md, ob, orcodm, MOD_APPLY_ORCO); } ASSERT_IS_VALID_DM(ndm); -- cgit v1.2.3