[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45496] trunk/blender: expose double limit used by auto-merge, addresses bug [#30884]

[Campbell Barton]

Revision: 45496
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45496
Author:   campbellbarton
Date:     2012-04-10 01:45:22 +0000 (Tue, 10 Apr 2012)
Log Message:
-----------
expose double limit used by auto-merge, addresses bug [#30884]

Modified Paths:
--------------
    trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    trunk/blender/source/blender/makesrna/intern/rna_scene.c

Modified: trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py	2012-04-10 00:56:38 UTC (rev 45495)
+++ trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py	2012-04-10 01:45:22 UTC (rev 45496)
@@ -198,6 +198,8 @@
         col.label("Edge Select Mode:")
         col.prop(tool_settings, "edge_path_mode", text="")
         col.prop(tool_settings, "edge_path_live_unwrap")
+        col.label("Double Threshold:")
+        col.prop(tool_settings, "double_threshold", text="")
 
 # ********** default tools for editmode_curve ****************
 

Modified: trunk/blender/source/blender/makesrna/intern/rna_scene.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_scene.c	2012-04-10 00:56:38 UTC (rev 45495)
+++ trunk/blender/source/blender/makesrna/intern/rna_scene.c	2012-04-10 01:45:22 UTC (rev 45496)
@@ -1563,6 +1563,12 @@
 	RNA_def_property_ui_range(prop, 0.01, 10.0, 10.0, 2);
 	RNA_def_property_update(prop, NC_GEOM|ND_DATA, NULL);
 
+	prop = RNA_def_property(srna, "double_threshold", PROP_FLOAT, PROP_DISTANCE);
+	RNA_def_property_float_sdna(prop, NULL, "doublimit");
+	RNA_def_property_ui_text(prop, "Double Threshold", "Limit for removing duplicates and 'Auto Merge'");
+	RNA_def_property_range(prop, 0.0, 1.0);
+	RNA_def_property_ui_range(prop, 0.0, 0.1, 0.01, 6);
+
 	prop = RNA_def_property(srna, "use_mesh_automerge", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "automerge", 0);
 	RNA_def_property_ui_text(prop, "AutoMerge Editing", "Automatically merge vertices moved to the same location");