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/modifiers/intern/MOD_subsurf.c | |
| parent | 7bbb83893539211ba91cae98818b1238cf21bea7 (diff) | |
more localized fix for [#36299], only changes behavior for subsurf with orco in editmode
Diffstat (limited to 'source/blender/modifiers/intern/MOD_subsurf.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_subsurf.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/modifiers/intern/MOD_subsurf.c b/source/blender/modifiers/intern/MOD_subsurf.c index 98cea62a2ff..4e2656bbf00 100644 --- a/source/blender/modifiers/intern/MOD_subsurf.c +++ b/source/blender/modifiers/intern/MOD_subsurf.c @@ -121,14 +121,14 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, static DerivedMesh *applyModifierEM(ModifierData *md, Object *UNUSED(ob), struct BMEditMesh *UNUSED(editData), DerivedMesh *derivedData, - ModifierApplyFlag UNUSED(flag)) + ModifierApplyFlag flag) { SubsurfModifierData *smd = (SubsurfModifierData *) md; DerivedMesh *result; + /* 'orco' using editmode flags would cause cache to be used twice in editbmesh_calc_modifiers */ + SubsurfFlags ss_flags = (flag & MOD_APPLY_ORCO) ? 0 : (SUBSURF_FOR_EDIT_MODE | SUBSURF_IN_EDIT_MODE); - result = subsurf_make_derived_from_derived(derivedData, smd, - NULL, (SUBSURF_FOR_EDIT_MODE | - SUBSURF_IN_EDIT_MODE)); + result = subsurf_make_derived_from_derived(derivedData, smd, NULL, ss_flags); return result; } |