From cbe544fb6cdf6eb41f7b82f5ccc16892f18aa9a9 Mon Sep 17 00:00:00 2001 From: Daniel Salazar Date: Thu, 10 Feb 2011 00:25:00 +0000 Subject: [PATCH] Set default for merge mirror to ON --- source/blender/makesrna/intern/rna_modifier.c | 2 +- source/blender/modifiers/intern/MOD_mirror.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c index 6045b920e01..3fa06da3e22 100644 --- a/source/blender/makesrna/intern/rna_modifier.c +++ b/source/blender/makesrna/intern/rna_modifier.c @@ -779,7 +779,7 @@ static void rna_def_modifier_mirror(BlenderRNA *brna) 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_ui_text(prop, "Merge Verticies", "Merge verticies within the merge threshold"); + RNA_def_property_ui_text(prop, "Merge Verticies", "Merge vertices within the merge threshold"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); prop= RNA_def_property(srna, "use_mirror_u", PROP_BOOLEAN, PROP_NONE); diff --git a/source/blender/modifiers/intern/MOD_mirror.c b/source/blender/modifiers/intern/MOD_mirror.c index 19f21ce655f..6771aaf493d 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); + mmd->flag |= (MOD_MIR_AXIS_X | MOD_MIR_VGROUP | MOD_MIR_MERGE); mmd->tolerance = 0.001; mmd->mirror_ob = NULL; }