Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Fox <mfoxdogg@gmail.com>2011-02-10 03:05:03 +0300
committerMichael Fox <mfoxdogg@gmail.com>2011-02-10 03:05:03 +0300
commit446299db1c0a4cf89068312174c7f30fadbd79d2 (patch)
tree97d82d78ce8e9345cd1ecd94f0643ff0ab05de62 /release
parentea50e5f5873f471c5f35b4a45330b3a2995e8891 (diff)
small feature request from zanqdo, merging in the mirror modifier is now optional, simply turning town the merge limit just simply do anything, and merging is off by default as this seems more logical behaviour
Diffstat (limited to 'release')
-rw-r--r--release/scripts/ui/properties_data_modifier.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/release/scripts/ui/properties_data_modifier.py b/release/scripts/ui/properties_data_modifier.py
index b3060e0f337..7a1ea160abc 100644
--- a/release/scripts/ui/properties_data_modifier.py
+++ b/release/scripts/ui/properties_data_modifier.py
@@ -363,7 +363,6 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel):
col.prop(md, "use_dynamic_bind")
def MIRROR(self, layout, ob, md):
- layout.prop(md, "merge_threshold")
split = layout.split(percentage=0.25)
col = split.column()
@@ -374,6 +373,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel):
col = split.column()
col.label(text="Options:")
+ col.prop(md, "use_mirror_merge", text="Merge")
col.prop(md, "use_clip", text="Clipping")
col.prop(md, "use_mirror_vertex_groups", text="Vertex Groups")
@@ -383,6 +383,9 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel):
col.prop(md, "use_mirror_v", text="V")
col = layout.column()
+
+ if md.use_mirror_merge == True:
+ col.prop(md, "merge_threshold")
col.label(text="Mirror Object:")
col.prop(md, "mirror_object", text="")