[Bf-extensions-cvs] [4e357d0] master: Fixed bug in minor diameter and Phillips bit dimensions. They were missing from the presets.
Aaron Keith
noreply at git.blender.org
Sat Feb 20 02:42:28 CET 2016
Commit: 4e357d0e5105aeaa6b8a414017dafe65d3499af4
Author: Aaron Keith
Date: Sat Feb 20 14:36:59 2016 +1300
Branches: master
https://developer.blender.org/rBA4e357d0e5105aeaa6b8a414017dafe65d3499af4
Fixed bug in minor diameter and Phillips bit dimensions. They were missing from the presets.
===================================================================
M add_mesh_BoltFactory/Boltfactory.py
M add_mesh_BoltFactory/__init__.py
M presets/operator/mesh.bolt_add/default.py
M presets/operator/mesh.bolt_add/m10.py
M presets/operator/mesh.bolt_add/m12.py
M presets/operator/mesh.bolt_add/m3.py
M presets/operator/mesh.bolt_add/m4.py
M presets/operator/mesh.bolt_add/m5.py
M presets/operator/mesh.bolt_add/m6.py
M presets/operator/mesh.bolt_add/m8.py
===================================================================
diff --git a/add_mesh_BoltFactory/Boltfactory.py b/add_mesh_BoltFactory/Boltfactory.py
index dd215a3..4a5b6b7 100644
--- a/add_mesh_BoltFactory/Boltfactory.py
+++ b/add_mesh_BoltFactory/Boltfactory.py
@@ -103,8 +103,7 @@ class add_mesh_bolt(bpy.types.Operator):
description='Diameter of the shank')
bf_Phillips_Bit_Depth = FloatProperty(attr='bf_Phillips_Bit_Depth',
- name='Bit Depth', default = 0, #set in execute
- options = {'HIDDEN'}, #gets calculated in execute
+ name='Bit Depth', default = 1.1431535482406616,
min = 0, soft_min = 0,max = MAX_INPUT_NUMBER,
description='Depth of the Phillips Bit')
@@ -154,8 +153,7 @@ class add_mesh_bolt(bpy.types.Operator):
description='Diameter of the Pan Head')
bf_Philips_Bit_Dia = FloatProperty(attr='bf_Philips_Bit_Dia',
- name='Bit Dia', default = 0, #set in execute
- options = {'HIDDEN'}, #gets calculated in execute
+ name='Bit Dia', default = 1.8199999332427979,
min = 0, soft_min = 0,max = MAX_INPUT_NUMBER,
description='Diameter of the Philips Bit')
@@ -175,8 +173,7 @@ class add_mesh_bolt(bpy.types.Operator):
description='Pitch if the thread')
bf_Minor_Dia = FloatProperty( attr='bf_Minor_Dia',
- name='Minor Dia', default = 0, #set in execute
- options = {'HIDDEN'}, #gets calculated in execute
+ name='Minor Dia', default = 2.6211137771606445,
min = 0, soft_min = 0, max = MAX_INPUT_NUMBER,
description='Inside diameter of the Thread')
@@ -269,7 +266,6 @@ class add_mesh_bolt(bpy.types.Operator):
def execute(self, context):
#print('EXECUTING...')
- self.bf_Phillips_Bit_Depth = float(Get_Phillips_Bit_Height(self.bf_Philips_Bit_Dia))
Create_New_Mesh(self, context, self.align_matrix)
return {'FINISHED'}
diff --git a/add_mesh_BoltFactory/__init__.py b/add_mesh_BoltFactory/__init__.py
index 6dd32b8..d031f5e 100644
--- a/add_mesh_BoltFactory/__init__.py
+++ b/add_mesh_BoltFactory/__init__.py
@@ -19,7 +19,7 @@
bl_info = {
"name": "BoltFactory",
"author": "Aaron Keith",
- "version": (3, 9),
+ "version": (3, 10),
"blender": (2, 63, 0),
"location": "View3D > Add > Mesh",
"description": "Add a bolt or nut",
diff --git a/presets/operator/mesh.bolt_add/default.py b/presets/operator/mesh.bolt_add/default.py
index 3680f0e..3f7a862 100644
--- a/presets/operator/mesh.bolt_add/default.py
+++ b/presets/operator/mesh.bolt_add/default.py
@@ -7,6 +7,7 @@ op.bf_Bit_Type = 'bf_Bit_None'
op.bf_Nut_Type = 'bf_Nut_Hex'
op.bf_Shank_Length = 0.0
op.bf_Shank_Dia = 3.0
+op.bf_Phillips_Bit_Depth = 1.1431535482406616
op.bf_Allen_Bit_Depth = 1.5
op.bf_Allen_Bit_Flat_Distance = 2.5
op.bf_Hex_Head_Height = 2.0
@@ -16,11 +17,12 @@ op.bf_Cap_Head_Height = 3.0
op.bf_Cap_Head_Dia = 5.5
op.bf_Dome_Head_Dia = 5.599999904632568
op.bf_Pan_Head_Dia = 5.599999904632568
+op.bf_Philips_Bit_Dia = 1.8199999332427979
op.bf_Thread_Length = 6.0
op.bf_Major_Dia = 3.0
op.bf_Pitch = 0.3499999940395355
+op.bf_Minor_Dia = 2.6211137771606445
op.bf_Crest_Percent = 10
op.bf_Root_Percent = 10
op.bf_Hex_Nut_Height = 2.4000000953674316
op.bf_Hex_Nut_Flat_Distance = 5.5
-op.bf_presets = 'M3.py'
diff --git a/presets/operator/mesh.bolt_add/m10.py b/presets/operator/mesh.bolt_add/m10.py
index e0be398..d304195 100644
--- a/presets/operator/mesh.bolt_add/m10.py
+++ b/presets/operator/mesh.bolt_add/m10.py
@@ -7,6 +7,7 @@ op.bf_Bit_Type = 'bf_Bit_None'
op.bf_Nut_Type = 'bf_Nut_Hex'
op.bf_Shank_Length = 0.0
op.bf_Shank_Dia = 10.0
+op.bf_Phillips_Bit_Depth = 4.082691192626953
op.bf_Allen_Bit_Depth = 5.0
op.bf_Allen_Bit_Flat_Distance = 8.0
op.bf_Hex_Head_Height = 6.400000095367432
@@ -16,11 +17,12 @@ op.bf_Cap_Head_Height = 10.0
op.bf_Cap_Head_Dia = 16.0
op.bf_Dome_Head_Dia = 20.0
op.bf_Pan_Head_Dia = 20.0
+op.bf_Philips_Bit_Dia = 6.5
op.bf_Thread_Length = 20.0
op.bf_Major_Dia = 10.0
op.bf_Pitch = 1.25
+op.bf_Minor_Dia = 8.646835327148438
op.bf_Crest_Percent = 10
op.bf_Root_Percent = 10
op.bf_Hex_Nut_Height = 8.0
op.bf_Hex_Nut_Flat_Distance = 17.0
-op.bf_presets = 'M10.py'
diff --git a/presets/operator/mesh.bolt_add/m12.py b/presets/operator/mesh.bolt_add/m12.py
index 835c702..0627496 100644
--- a/presets/operator/mesh.bolt_add/m12.py
+++ b/presets/operator/mesh.bolt_add/m12.py
@@ -7,6 +7,7 @@ op.bf_Bit_Type = 'bf_Bit_None'
op.bf_Nut_Type = 'bf_Nut_Hex'
op.bf_Shank_Length = 33.0
op.bf_Shank_Dia = 12.0
+op.bf_Phillips_Bit_Depth = 4.899229526519775
op.bf_Allen_Bit_Depth = 6.0
op.bf_Allen_Bit_Flat_Distance = 10.0
op.bf_Hex_Head_Height = 7.5
@@ -16,11 +17,12 @@ op.bf_Cap_Head_Height = 12.0
op.bf_Cap_Head_Dia = 18.5
op.bf_Dome_Head_Dia = 24.0
op.bf_Pan_Head_Dia = 24.0
+op.bf_Philips_Bit_Dia = 7.800000190734863
op.bf_Thread_Length = 32.0
op.bf_Major_Dia = 12.0
op.bf_Pitch = 1.5
+op.bf_Minor_Dia = 10.376201629638672
op.bf_Crest_Percent = 10
op.bf_Root_Percent = 10
op.bf_Hex_Nut_Height = 10.0
op.bf_Hex_Nut_Flat_Distance = 19.0
-op.bf_presets = 'M12.py'
diff --git a/presets/operator/mesh.bolt_add/m3.py b/presets/operator/mesh.bolt_add/m3.py
index 3680f0e..3f7a862 100644
--- a/presets/operator/mesh.bolt_add/m3.py
+++ b/presets/operator/mesh.bolt_add/m3.py
@@ -7,6 +7,7 @@ op.bf_Bit_Type = 'bf_Bit_None'
op.bf_Nut_Type = 'bf_Nut_Hex'
op.bf_Shank_Length = 0.0
op.bf_Shank_Dia = 3.0
+op.bf_Phillips_Bit_Depth = 1.1431535482406616
op.bf_Allen_Bit_Depth = 1.5
op.bf_Allen_Bit_Flat_Distance = 2.5
op.bf_Hex_Head_Height = 2.0
@@ -16,11 +17,12 @@ op.bf_Cap_Head_Height = 3.0
op.bf_Cap_Head_Dia = 5.5
op.bf_Dome_Head_Dia = 5.599999904632568
op.bf_Pan_Head_Dia = 5.599999904632568
+op.bf_Philips_Bit_Dia = 1.8199999332427979
op.bf_Thread_Length = 6.0
op.bf_Major_Dia = 3.0
op.bf_Pitch = 0.3499999940395355
+op.bf_Minor_Dia = 2.6211137771606445
op.bf_Crest_Percent = 10
op.bf_Root_Percent = 10
op.bf_Hex_Nut_Height = 2.4000000953674316
op.bf_Hex_Nut_Flat_Distance = 5.5
-op.bf_presets = 'M3.py'
diff --git a/presets/operator/mesh.bolt_add/m4.py b/presets/operator/mesh.bolt_add/m4.py
index a61a322..af17e3a 100644
--- a/presets/operator/mesh.bolt_add/m4.py
+++ b/presets/operator/mesh.bolt_add/m4.py
@@ -7,6 +7,7 @@ op.bf_Bit_Type = 'bf_Bit_None'
op.bf_Nut_Type = 'bf_Nut_Hex'
op.bf_Shank_Length = 0.0
op.bf_Shank_Dia = 4.0
+op.bf_Phillips_Bit_Depth = 1.6330764293670654
op.bf_Allen_Bit_Depth = 2.0
op.bf_Allen_Bit_Flat_Distance = 3.0
op.bf_Hex_Head_Height = 2.799999952316284
@@ -16,11 +17,12 @@ op.bf_Cap_Head_Height = 4.0
op.bf_Cap_Head_Dia = 7.0
op.bf_Dome_Head_Dia = 8.0
op.bf_Pan_Head_Dia = 8.0
+op.bf_Philips_Bit_Dia = 2.5999999046325684
op.bf_Thread_Length = 8.0
op.bf_Major_Dia = 4.0
op.bf_Pitch = 0.5
+op.bf_Minor_Dia = 3.4587340354919434
op.bf_Crest_Percent = 10
op.bf_Root_Percent = 10
op.bf_Hex_Nut_Height = 3.200000047683716
op.bf_Hex_Nut_Flat_Distance = 7.0
-op.bf_presets = 'M4.py'
diff --git a/presets/operator/mesh.bolt_add/m5.py b/presets/operator/mesh.bolt_add/m5.py
index 7e18e8a..6649ad8 100644
--- a/presets/operator/mesh.bolt_add/m5.py
+++ b/presets/operator/mesh.bolt_add/m5.py
@@ -7,6 +7,7 @@ op.bf_Bit_Type = 'bf_Bit_None'
op.bf_Nut_Type = 'bf_Nut_Hex'
op.bf_Shank_Length = 0.0
op.bf_Shank_Dia = 5.0
+op.bf_Phillips_Bit_Depth = 1.9392783641815186
op.bf_Allen_Bit_Depth = 2.5
op.bf_Allen_Bit_Flat_Distance = 4.0
op.bf_Hex_Head_Height = 3.5
@@ -16,11 +17,12 @@ op.bf_Cap_Head_Height = 5.0
op.bf_Cap_Head_Dia = 8.5
op.bf_Dome_Head_Dia = 9.5
op.bf_Pan_Head_Dia = 9.5
+op.bf_Philips_Bit_Dia = 3.0875000953674316
op.bf_Thread_Length = 10.0
op.bf_Major_Dia = 5.0
op.bf_Pitch = 0.5
+op.bf_Minor_Dia = 4.458734035491943
op.bf_Crest_Percent = 10
op.bf_Root_Percent = 10
op.bf_Hex_Nut_Height = 4.0
op.bf_Hex_Nut_Flat_Distance = 8.0
-op.bf_presets = 'M5.py'
diff --git a/presets/operator/mesh.bolt_add/m6.py b/presets/operator/mesh.bolt_add/m6.py
index 9d0068e..85a2f9e 100644
--- a/presets/operator/mesh.bolt_add/m6.py
+++ b/presets/operator/mesh.bolt_add/m6.py
@@ -7,6 +7,7 @@ op.bf_Bit_Type = 'bf_Bit_None'
op.bf_Nut_Type = 'bf_Nut_Hex'
op.bf_Shank_Length = 0.0
op.bf_Shank_Dia = 6.0
+op.bf_Phillips_Bit_Depth = 2.4496147632598877
op.bf_Allen_Bit_Depth = 3.0
op.bf_Allen_Bit_Flat_Distance = 5.0
op.bf_Hex_Head_Height = 4.0
@@ -16,11 +17,12 @@ op.bf_Cap_Head_Height = 6.0
op.bf_Cap_Head_Dia = 10.0
op.bf_Dome_Head_Dia = 12.0
op.bf_Pan_Head_Dia = 12.0
+op.bf_Philips_Bit_Dia = 3.9000000953674316
op.bf_Thread_Length = 12.0
op.bf_Major_Dia = 6.0
op.bf_Pitch = 0.75
+op.bf_Minor_Dia = 5.188100814819336
op.bf_Crest_Percent = 10
op.bf_Root_Percent = 10
op.bf_Hex_Nut_Height = 5.0
op.bf_Hex_Nut_Flat_Distance = 10.0
-op.bf_presets = 'M6.py'
diff --git a/presets/operator/mesh.bolt_add/m8.py b/presets/operator/mesh.bolt_add/m8.py
index d87abb5..7c0e8f8 100644
--- a/presets/operator/mesh.bolt_add/m8.py
+++ b/presets/operator/mesh.bolt_add/m8.py
@@ -7,6 +7,7 @@ op.bf_Bit_Type = 'bf_Bit_None'
op.bf_Nut_Type = 'bf_Nut_Hex'
op.bf_Shank_Length = 0.0
op.bf_Shank_Dia = 8.0
+op.bf_Phillips_Bit_Depth = 3.266152858734131
op.bf_Allen_Bit_Depth = 4.0
op.bf_Allen_Bit_Flat_Distance = 6.0
op.bf_Hex_Head_Height = 5.300000190734863
@@ -16,11 +17,12 @@ op.bf_Cap_Head_Height = 8.0
op.bf_Cap_Head_Dia = 13.5
op.bf_Dome_Head_Dia = 16.0
op.bf_Pan_Head_Dia = 16.0
+op.bf_Philips_Bit_Dia = 5.199999809265137
op.bf_Thread_Length = 16.0
op.bf_Major_Dia = 8.0
op.bf_Pitch = 1.0
+op.bf_Minor_Dia = 6.917468070983887
op.bf_Crest_Percent = 10
op.bf_Root_Percent = 10
op.bf_Hex_Nut_Height = 6.5
op.bf_Hex_Nut_Flat_Distance = 13.0
-op.bf_presets = 'M8.py'
More information about the Bf-extensions-cvs
mailing list