diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-05-20 20:52:10 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-05-20 20:52:10 +0400 |
| commit | 88f4087a574c2f74b3414d47dab8be97cce4bc84 (patch) | |
| tree | f1440d4aa18d73c4d1449857ccabefc444d867e2 /source/blender/blenkernel/intern/shrinkwrap.c | |
| parent | 4514be8f4ff5c87824e447c7016939363f66f78c (diff) | |
| parent | 259582235c5dc211f998e2c1924faae6c9b7a87e (diff) | |
svn merge -r36725:36801 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'source/blender/blenkernel/intern/shrinkwrap.c')
| -rw-r--r-- | source/blender/blenkernel/intern/shrinkwrap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/shrinkwrap.c b/source/blender/blenkernel/intern/shrinkwrap.c index 653e7612a17..fcdf30be992 100644 --- a/source/blender/blenkernel/intern/shrinkwrap.c +++ b/source/blender/blenkernel/intern/shrinkwrap.c @@ -564,7 +564,7 @@ void shrinkwrapModifier_deform(ShrinkwrapModifierData *smd, Object *ob, DerivedM ssmd.subdivType = ME_CC_SUBSURF; //catmull clark ssmd.levels = smd->subsurfLevels; //levels - ss_mesh = subsurf_make_derived_from_derived(dm, &ssmd, FALSE, NULL, 0, 0); + ss_mesh = subsurf_make_derived_from_derived(dm, &ssmd, FALSE, NULL, 0, 0, (ob->mode & OB_MODE_EDIT)); if(ss_mesh) { |