diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-09-12 14:41:00 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-09-12 14:41:00 +0400 |
| commit | c9dfe7bd74a03886d4284985418619ccf5077ac3 (patch) | |
| tree | 0cc3f49b5df73eff5c56fc2e220c1294cd25c6b9 /source/blender/blenkernel/intern/DerivedMesh.c | |
| parent | 7bbb83893539211ba91cae98818b1238cf21bea7 (diff) | |
more localized fix for [#36299], only changes behavior for subsurf with orco in editmode
Diffstat (limited to 'source/blender/blenkernel/intern/DerivedMesh.c')
| -rw-r--r-- | source/blender/blenkernel/intern/DerivedMesh.c | 6 |
1 files changed, 1 insertions, 5 deletions
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); |