From 81ef518e009705d1cfbf4843e06c74553fd26f92 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Wed, 14 Nov 2012 03:16:56 +0000
Subject: [PATCH] update for changes in svn
---
add_mesh_ant_landscape.py | 2 +-
io_import_scene_dxf.py | 2 +-
mesh_bsurfaces.py | 12 ++++++------
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/add_mesh_ant_landscape.py b/add_mesh_ant_landscape.py
index c3aeb866c..52c285694 100644
--- a/add_mesh_ant_landscape.py
+++ b/add_mesh_ant_landscape.py
@@ -781,7 +781,7 @@ class landscape_add(bpy.types.Operator):
# 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
diff --git a/io_import_scene_dxf.py b/io_import_scene_dxf.py
index 87cdd51e5..f0cc671e2 100644
--- a/io_import_scene_dxf.py
+++ b/io_import_scene_dxf.py
@@ -2376,7 +2376,7 @@ def removeDoubles(ob):
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')
diff --git a/mesh_bsurfaces.py b/mesh_bsurfaces.py
index a107f6618..2f33ed67b 100644
--- a/mesh_bsurfaces.py
+++ b/mesh_bsurfaces.py
@@ -789,7 +789,7 @@ class GPENCIL_OT_SURFSK_add_surface(bpy.types.Operator):
#### 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 @@ class GPENCIL_OT_SURFSK_add_surface(bpy.types.Operator):
# 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 @@ class GPENCIL_OT_SURFSK_add_surface(bpy.types.Operator):
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 @@ class GPENCIL_OT_SURFSK_add_surface(bpy.types.Operator):
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 @@ class GPENCIL_OT_SURFSK_add_surface(bpy.types.Operator):
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 @@ class GPENCIL_OT_SURFSK_add_surface(bpy.types.Operator):
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')
--
GitLab