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 | |
| parent | cbe544fb6cdf6eb41f7b82f5ccc16892f18aa9a9 (diff) | |
small fix so older files are loaded with merge on in the mirror modifiers
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/makesdna/DNA_modifier_types.h | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_modifier.c | 2 | ||||
| -rw-r--r-- | source/blender/modifiers/intern/MOD_mirror.c | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h index f219f54cc25..b5bcd20a759 100644 --- a/source/blender/makesdna/DNA_modifier_types.h +++ b/source/blender/makesdna/DNA_modifier_types.h @@ -235,7 +235,7 @@ typedef struct MirrorModifierData { #define MOD_MIR_AXIS_Y (1<<4) #define MOD_MIR_AXIS_Z (1<<5) #define MOD_MIR_VGROUP (1<<6) -#define MOD_MIR_MERGE (1<<7) +#define MOD_MIR_NO_MERGE (1<<7) typedef struct EdgeSplitModifierData { ModifierData modifier; diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c index 3fa06da3e22..01e6d57f2c6 100644 --- a/source/blender/makesrna/intern/rna_modifier.c +++ b/source/blender/makesrna/intern/rna_modifier.c @@ -778,7 +778,7 @@ static void rna_def_modifier_mirror(BlenderRNA *brna) RNA_def_property_update(prop, 0, "rna_Modifier_update"); prop= RNA_def_property(srna, "use_mirror_merge", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_MIR_MERGE); + RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", MOD_MIR_NO_MERGE); RNA_def_property_ui_text(prop, "Merge Verticies", "Merge vertices within the merge threshold"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); 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 |