diff options
| author | Michael Fox <mfoxdogg@gmail.com> | 2011-02-10 03:44:26 +0300 |
|---|---|---|
| committer | Michael Fox <mfoxdogg@gmail.com> | 2011-02-10 03:44:26 +0300 |
| commit | 0ebf448beea18856defaddbbfd842f0911cca431 (patch) | |
| tree | e579dd1a30488d0e48a029ad8435c14fbb2a0698 /source/blender/modifiers/intern/MOD_mirror.c | |
| parent | cbe544fb6cdf6eb41f7b82f5ccc16892f18aa9a9 (diff) | |
small fix so older files are loaded with merge on in the mirror modifiers
Diffstat (limited to 'source/blender/modifiers/intern/MOD_mirror.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_mirror.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/modifiers/intern/MOD_mirror.c b/source/blender/modifiers/intern/MOD_mirror.c index 6771aaf493d..5c73b2f0866 100644 --- a/source/blender/modifiers/intern/MOD_mirror.c +++ b/source/blender/modifiers/intern/MOD_mirror.c @@ -49,7 +49,7 @@ static void initData(ModifierData *md) { MirrorModifierData *mmd = (MirrorModifierData*) md; - mmd->flag |= (MOD_MIR_AXIS_X | MOD_MIR_VGROUP | MOD_MIR_MERGE); + mmd->flag |= (MOD_MIR_AXIS_X | MOD_MIR_VGROUP); mmd->tolerance = 0.001; mmd->mirror_ob = NULL; } @@ -143,10 +143,10 @@ static DerivedMesh *doMirrorOnAxis(MirrorModifierData *mmd, mul_m4_v3(mtx, co); } - if(mmd->flag & MOD_MIR_MERGE) - isShared = ABS(co[axis])<=tolerance; - else + if(mmd->flag & MOD_MIR_NO_MERGE) isShared = 0; + else + isShared = ABS(co[axis])<=tolerance; /* Because the topology result (# of vertices) must be the same if * the mesh data is overridden by vertex cos, have to calc sharedness |