[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34747] trunk/blender/source/blender: Set default for merge mirror to ON
Daniel Salazar
zanqdo at gmail.com
Thu Feb 10 01:25:01 CET 2011
Revision: 34747
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34747
Author: zanqdo
Date: 2011-02-10 00:25:00 +0000 (Thu, 10 Feb 2011)
Log Message:
-----------
Set default for merge mirror to ON
Modified Paths:
--------------
trunk/blender/source/blender/makesrna/intern/rna_modifier.c
trunk/blender/source/blender/modifiers/intern/MOD_mirror.c
Modified: trunk/blender/source/blender/makesrna/intern/rna_modifier.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_modifier.c 2011-02-10 00:05:54 UTC (rev 34746)
+++ trunk/blender/source/blender/makesrna/intern/rna_modifier.c 2011-02-10 00:25:00 UTC (rev 34747)
@@ -779,7 +779,7 @@
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);
Modified: trunk/blender/source/blender/modifiers/intern/MOD_mirror.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_mirror.c 2011-02-10 00:05:54 UTC (rev 34746)
+++ trunk/blender/source/blender/modifiers/intern/MOD_mirror.c 2011-02-10 00:25:00 UTC (rev 34747)
@@ -49,7 +49,7 @@
{
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;
}
More information about the Bf-blender-cvs
mailing list