[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [3963] trunk/py/scripts/addons: update for changes in svn

[Campbell Barton]

Revision: 3963
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=3963
Author:   campbellbarton
Date:     2012-11-14 03:16:56 +0000 (Wed, 14 Nov 2012)
Log Message:
-----------
update for changes in svn

Modified Paths:
--------------
    trunk/py/scripts/addons/add_mesh_ant_landscape.py
    trunk/py/scripts/addons/io_import_scene_dxf.py
    trunk/py/scripts/addons/mesh_bsurfaces.py

Modified: trunk/py/scripts/addons/add_mesh_ant_landscape.py
===================================================================
--- trunk/py/scripts/addons/add_mesh_ant_landscape.py	2012-11-14 02:59:38 UTC (rev 3962)
+++ trunk/py/scripts/addons/add_mesh_ant_landscape.py	2012-11-14 03:16:56 UTC (rev 3963)
@@ -781,7 +781,7 @@
             # sphere, remove doubles
             if self.SphereMesh !=0:
                 bpy.ops.object.mode_set(mode='EDIT')
-                bpy.ops.mesh.remove_doubles(mergedist=0.0001)
+                bpy.ops.mesh.remove_doubles(threshold=0.0001)
                 bpy.ops.object.mode_set(mode='OBJECT')
 
             # Shade smooth

Modified: trunk/py/scripts/addons/io_import_scene_dxf.py
===================================================================
--- trunk/py/scripts/addons/io_import_scene_dxf.py	2012-11-14 02:59:38 UTC (rev 3962)
+++ trunk/py/scripts/addons/io_import_scene_dxf.py	2012-11-14 03:16:56 UTC (rev 3963)
@@ -2376,7 +2376,7 @@
         scn = bpy.context.scene
         scn.objects.active = ob
         bpy.ops.object.mode_set(mode='EDIT')
-        bpy.ops.mesh.remove_doubles(mergedist=theMergeLimit)
+        bpy.ops.mesh.remove_doubles(threshold=theMergeLimit)
         bpy.ops.object.mode_set(mode='OBJECT')
 
 

Modified: trunk/py/scripts/addons/mesh_bsurfaces.py
===================================================================
--- trunk/py/scripts/addons/mesh_bsurfaces.py	2012-11-14 02:59:38 UTC (rev 3962)
+++ trunk/py/scripts/addons/mesh_bsurfaces.py	2012-11-14 03:16:56 UTC (rev 3963)
@@ -789,7 +789,7 @@
         
         #### Perform "Remove Doubles" to weld all the disconnected verts
         bpy.ops.object.mode_set('INVOKE_REGION_WIN', mode='EDIT')
-        bpy.ops.mesh.remove_doubles(mergedist = 0.0001)
+        bpy.ops.mesh.remove_doubles(threshold=0.0001)
         
         bpy.ops.object.mode_set('INVOKE_REGION_WIN', mode='OBJECT')
         
@@ -1082,7 +1082,7 @@
             # Find "intersection-nodes".
             bpy.ops.object.editmode_toggle('INVOKE_REGION_WIN')
             bpy.ops.mesh.select_all('INVOKE_REGION_WIN', action='SELECT')
-            bpy.ops.mesh.remove_doubles('INVOKE_REGION_WIN', mergedist=self.crosshatch_merge_distance)
+            bpy.ops.mesh.remove_doubles('INVOKE_REGION_WIN', threshold=self.crosshatch_merge_distance)
             bpy.ops.mesh.select_all('INVOKE_REGION_WIN', action='DESELECT')
             bpy.ops.object.editmode_toggle('INVOKE_REGION_WIN')
             
@@ -1114,7 +1114,7 @@
             bpy.ops.mesh.select_all('INVOKE_REGION_WIN', action='SELECT')
             
             # Remove doubles to discard very near verts from calculations of distance.
-            bpy.ops.mesh.remove_doubles('INVOKE_REGION_WIN', mergedist=self.crosshatch_merge_distance * 4)
+            bpy.ops.mesh.remove_doubles('INVOKE_REGION_WIN', threshold=self.crosshatch_merge_distance * 4.0)
             bpy.ops.object.editmode_toggle('INVOKE_REGION_WIN')
             
             # Get all coords of the resulting nodes.
@@ -1420,7 +1420,7 @@
         
         bpy.ops.object.editmode_toggle('INVOKE_REGION_WIN')
         bpy.ops.mesh.select_all('INVOKE_REGION_WIN', action='SELECT')
-        bpy.ops.mesh.remove_doubles('INVOKE_REGION_WIN', mergedist=average_edge_length / 15)
+        bpy.ops.mesh.remove_doubles('INVOKE_REGION_WIN', threshold=average_edge_length / 15.0)
         bpy.ops.object.editmode_toggle('INVOKE_REGION_WIN')
         
         final_points_ob = bpy.context.scene.objects.active
@@ -1703,7 +1703,7 @@
         bpy.ops.object.editmode_toggle('INVOKE_REGION_WIN')
         # Perform Remove doubles to merge verts.
         if not (self.automatic_join == False and self.main_object_selected_verts_count == 0):
-            bpy.ops.mesh.remove_doubles(mergedist=0.0001)
+            bpy.ops.mesh.remove_doubles(threshold=0.0001)
         
         bpy.ops.mesh.select_all(action='DESELECT')
         
@@ -2850,7 +2850,7 @@
         
         bpy.ops.object.editmode_toggle('INVOKE_REGION_WIN')
         
-        bpy.ops.mesh.remove_doubles('INVOKE_REGION_WIN', mergedist=0.0001)
+        bpy.ops.mesh.remove_doubles('INVOKE_REGION_WIN', threshold=0.0001)
         bpy.ops.mesh.normals_make_consistent('INVOKE_REGION_WIN', inside=False)
         bpy.ops.mesh.select_all('INVOKE_REGION_WIN', action='DESELECT')