diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-07-29 06:15:01 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-07-29 06:15:01 +0400 |
| commit | de92597967c18bbd9d69341789a4399ec354ef65 (patch) | |
| tree | 6ae86f666f751a6f3c34db6bd4c56bf22d0be652 /source/blender/blenkernel/intern/multires.c | |
| parent | 73dde4e26f949af64d9a95283525201f91feee11 (diff) | |
fix for last merge
Diffstat (limited to 'source/blender/blenkernel/intern/multires.c')
| -rw-r--r-- | source/blender/blenkernel/intern/multires.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/multires.c b/source/blender/blenkernel/intern/multires.c index 342c7c92e3a..10efb970be1 100644 --- a/source/blender/blenkernel/intern/multires.c +++ b/source/blender/blenkernel/intern/multires.c @@ -482,7 +482,7 @@ static DerivedMesh *subsurf_dm_create_local(Object *ob, DerivedMesh *dm, int lvl if(optimal) smd.flags |= eSubsurfModifierFlag_ControlEdges; - return subsurf_make_derived_from_derived(dm, &smd, 0, NULL, 0, 0, (ob->mode & OB_MODE_EDIT)); + return subsurf_make_derived_from_derived(dm, &smd, 0, NULL, 0, 0, (ob->mode & OB_MODE_EDIT)); } @@ -941,7 +941,7 @@ void multires_set_space(DerivedMesh *dm, Object *ob, int from, int to) ccgdm = multires_dm_create_local(ob, dm, totlvl, totlvl, mmd->simple); subsurf = subsurf_dm_create_local(ob, dm, totlvl, - mmd->simple, mmd->flags & eMultiresModifierFlag_ControlEdges); + mmd->simple, mmd->flags & eMultiresModifierFlag_ControlEdges, mmd->flags & eMultiresModifierFlag_PlainUv); numGrids = subsurf->getNumGrids(subsurf); gridSize = subsurf->getGridSize(subsurf); |