[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34746] trunk/blender/release/scripts/ui/ properties_data_modifier.py: missing UI changes from previous commit

Michael Fox mfoxdogg at gmail.com
Thu Feb 10 01:05:56 CET 2011


Revision: 34746
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34746
Author:   mfoxdogg
Date:     2011-02-10 00:05:54 +0000 (Thu, 10 Feb 2011)
Log Message:
-----------
missing UI changes from previous commit

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/properties_data_modifier.py

Modified: trunk/blender/release/scripts/ui/properties_data_modifier.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_data_modifier.py	2011-02-10 00:05:03 UTC (rev 34745)
+++ trunk/blender/release/scripts/ui/properties_data_modifier.py	2011-02-10 00:05:54 UTC (rev 34746)
@@ -363,7 +363,6 @@
             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 @@
 
         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 @@
         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="")
 




More information about the Bf-blender-cvs mailing list