diff options
author | Campbell Barton <ideasman42@gmail.com> | 2020-01-29 05:47:19 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2020-01-29 05:47:19 +0300 |
commit | b85840836438856c0a296bb8281aa459e076d129 (patch) | |
tree | 124dc56bbdcd1b8344dd10f707378f9bfea87e0b /add_mesh_extra_objects | |
parent | 711829f2cd8b247bf0e17380684e3718dc202e65 (diff) |
Cleanup: trailing space
Diffstat (limited to 'add_mesh_extra_objects')
-rw-r--r-- | add_mesh_extra_objects/Wallfactory.py | 8 | ||||
-rw-r--r-- | add_mesh_extra_objects/__init__.py | 12 | ||||
-rw-r--r-- | add_mesh_extra_objects/add_mesh_3d_function_surface.py | 6 | ||||
-rw-r--r-- | add_mesh_extra_objects/add_mesh_beam_builder.py | 4 | ||||
-rw-r--r-- | add_mesh_extra_objects/add_mesh_gears.py | 40 | ||||
-rw-r--r-- | add_mesh_extra_objects/add_mesh_gemstones.py | 18 | ||||
-rw-r--r-- | add_mesh_extra_objects/add_mesh_pipe_joint.py | 20 | ||||
-rw-r--r-- | add_mesh_extra_objects/add_mesh_round_brilliant.py | 8 | ||||
-rw-r--r-- | add_mesh_extra_objects/utils.py | 2 |
9 files changed, 59 insertions, 59 deletions
diff --git a/add_mesh_extra_objects/Wallfactory.py b/add_mesh_extra_objects/Wallfactory.py index 865f9150..a70b0217 100644 --- a/add_mesh_extra_objects/Wallfactory.py +++ b/add_mesh_extra_objects/Wallfactory.py @@ -65,7 +65,7 @@ class add_mesh_wallb(Operator, object_utils.AddObjectHelper): # UI items - API for properties - User accessible variables... # not all options are via UI, and some operations just don't work yet - + Wall : BoolProperty(name = "Wall", default = True, description = "Wall") @@ -899,14 +899,14 @@ class add_mesh_wallb(Operator, object_utils.AddObjectHelper): obj = object_utils.object_data_add(context, mesh, operator=None) utils.setlocation(self, context) - + mesh.update() - + obj.data["Wall"] = True obj.data["change"] = False for prm in WallParameters(): obj.data[prm] = getattr(self, prm) - + if bpy.context.mode == "EDIT_MESH": active_object = context.active_object name_active_object = active_object.name diff --git a/add_mesh_extra_objects/__init__.py b/add_mesh_extra_objects/__init__.py index d009f0a5..d3113b5d 100644 --- a/add_mesh_extra_objects/__init__.py +++ b/add_mesh_extra_objects/__init__.py @@ -234,10 +234,10 @@ def menu_func(self, context): def Extras_contex_menu(self, context): bl_label = 'Change' - + obj = context.object layout = self.layout - + if 'Gear' in obj.data.keys(): props = layout.operator("mesh.primitive_gear", text="Change Gear") props.change = True @@ -251,7 +251,7 @@ def Extras_contex_menu(self, context): for prm in add_mesh_gears.WormGearParameters(): setattr(props, prm, obj.data[prm]) layout.separator() - + if 'Beam' in obj.data.keys(): props = layout.operator("mesh.add_beam", text="Change Beam") props.change = True @@ -307,14 +307,14 @@ def Extras_contex_menu(self, context): for prm in add_mesh_gemstones.DiamondParameters(): setattr(props, prm, obj.data[prm]) layout.separator() - + if 'Gem' in obj.data.keys(): props = layout.operator("mesh.primitive_gem_add", text="Change Gem") props.change = True for prm in add_mesh_gemstones.GemParameters(): setattr(props, prm, obj.data[prm]) layout.separator() - + if 'Brilliant' in obj.data.keys(): props = layout.operator("mesh.primitive_brilliant_add", text="Change Brilliant") props.change = True @@ -380,7 +380,7 @@ def unregister(): # Remove "Extras" menu from the "Add Mesh" menu and context menu. bpy.types.VIEW3D_MT_object_context_menu.remove(Extras_contex_menu) bpy.types.VIEW3D_MT_mesh_add.remove(menu_func) - + from bpy.utils import unregister_class for cls in reversed(classes): unregister_class(cls) diff --git a/add_mesh_extra_objects/add_mesh_3d_function_surface.py b/add_mesh_extra_objects/add_mesh_3d_function_surface.py index b9842615..2faae605 100644 --- a/add_mesh_extra_objects/add_mesh_3d_function_surface.py +++ b/add_mesh_extra_objects/add_mesh_3d_function_surface.py @@ -536,13 +536,13 @@ class AddXYZFunctionSurface(Operator): return {'CANCELLED'} obj = create_mesh_object(context, verts, [], faces, "XYZ Function") - + if self.show_wire: obj.show_wire = True - + if self.edit_mode: bpy.ops.object.mode_set(mode = 'EDIT') else: - bpy.ops.object.mode_set(mode = 'OBJECT') + bpy.ops.object.mode_set(mode = 'OBJECT') return {'FINISHED'} diff --git a/add_mesh_extra_objects/add_mesh_beam_builder.py b/add_mesh_extra_objects/add_mesh_beam_builder.py index 4650e37a..f9c2c4b9 100644 --- a/add_mesh_extra_objects/add_mesh_beam_builder.py +++ b/add_mesh_extra_objects/add_mesh_beam_builder.py @@ -693,7 +693,7 @@ class addBeam(Operator, object_utils.AddObjectHelper): change : BoolProperty(name = "Change", default = False, description = "change Beam") - + Type: EnumProperty( items=( ('0', "Box Profile", "Square Beam"), @@ -803,7 +803,7 @@ class addBeam(Operator, object_utils.AddObjectHelper): obj.data[prm] = getattr(self, prm) return {'FINISHED'} - + if bpy.context.mode == "EDIT_MESH": active_object = context.active_object name_active_object = active_object.name diff --git a/add_mesh_extra_objects/add_mesh_gears.py b/add_mesh_extra_objects/add_mesh_gears.py index a5fabe4b..484d4e14 100644 --- a/add_mesh_extra_objects/add_mesh_gears.py +++ b/add_mesh_extra_objects/add_mesh_gears.py @@ -543,7 +543,7 @@ def add_worm(teethNum, rowNum, radius, Ad, De, p_angle, return verts, faces, vgroup_top, vgroup_valley def AddGearMesh(self, context): - + verts, faces, verts_tip, verts_valley = add_gear( self.number_of_teeth, self.radius, @@ -556,10 +556,10 @@ def AddGearMesh(self, context): conangle=self.conangle, crown=self.crown ) - + mesh = bpy.data.meshes.new("Gear") mesh.from_pydata(verts, [], faces) - + return mesh, verts_tip, verts_valley @@ -684,7 +684,7 @@ class AddGear(Operator, object_utils.AddObjectHelper): return context.scene is not None def execute(self, context): - + if bpy.context.mode == "OBJECT": if context.selected_objects != [] and context.active_object and \ ('Gear' in context.active_object.data.keys()) and (self.change == True): @@ -697,10 +697,10 @@ class AddGear(Operator, object_utils.AddObjectHelper): bpy.ops.object.vertex_group_remove(all=True) except: pass - + for material in oldmesh.materials: obj.data.materials.append(material) - + bpy.data.meshes.remove(oldmesh) obj.data.name = oldmeshname else: @@ -712,10 +712,10 @@ class AddGear(Operator, object_utils.AddObjectHelper): # Create vertex groups from stored vertices. tipGroup = obj.vertex_groups.new(name='Tips') tipGroup.add(verts_tip, 1.0, 'ADD') - + valleyGroup = obj.vertex_groups.new(name='Valleys') valleyGroup.add(verts_valley, 1.0, 'ADD') - + obj.data["Gear"] = True obj.data["change"] = False for prm in GearParameters(): @@ -727,14 +727,14 @@ class AddGear(Operator, object_utils.AddObjectHelper): bpy.ops.object.mode_set(mode='OBJECT') mesh, verts_tip, verts_valley = AddGearMesh(self, context) obj = object_utils.object_data_add(context, mesh, operator=None) - + # Create vertex groups from stored vertices. tipGroup = obj.vertex_groups.new(name='Tips') tipGroup.add(verts_tip, 1.0, 'ADD') - + valleyGroup = obj.vertex_groups.new(name='Valleys') valleyGroup.add(verts_valley, 1.0, 'ADD') - + obj.select_set(True) active_object.select_set(True) bpy.ops.object.join() @@ -778,10 +778,10 @@ def AddWormGearMesh(self, context): skew=self.skew, crown=self.crown ) - + mesh = bpy.data.meshes.new("Worm Gear") mesh.from_pydata(verts, [], faces) - + return mesh, verts_tip, verts_valley @@ -913,10 +913,10 @@ class AddWormGear(Operator, object_utils.AddObjectHelper): bpy.ops.object.vertex_group_remove(all=True) except: pass - + for material in oldmesh.materials: obj.data.materials.append(material) - + bpy.data.meshes.remove(oldmesh) obj.data.name = oldmeshname else: @@ -928,10 +928,10 @@ class AddWormGear(Operator, object_utils.AddObjectHelper): # Create vertex groups from stored vertices. tipGroup = obj.vertex_groups.new(name = 'Tips') tipGroup.add(verts_tip, 1.0, 'ADD') - + valleyGroup = obj.vertex_groups.new(name = 'Valleys') valleyGroup.add(verts_valley, 1.0, 'ADD') - + obj.data["WormGear"] = True obj.data["change"] = False for prm in WormGearParameters(): @@ -943,14 +943,14 @@ class AddWormGear(Operator, object_utils.AddObjectHelper): bpy.ops.object.mode_set(mode='OBJECT') mesh, verts_tip, verts_valley = AddWormGearMesh(self, context) obj = object_utils.object_data_add(context, mesh, operator=None) - + # Create vertex groups from stored vertices. tipGroup = obj.vertex_groups.new(name = 'Tips') tipGroup.add(verts_tip, 1.0, 'ADD') - + valleyGroup = obj.vertex_groups.new(name = 'Valleys') valleyGroup.add(verts_valley, 1.0, 'ADD') - + obj.select_set(True) active_object.select_set(True) bpy.ops.object.join() diff --git a/add_mesh_extra_objects/add_mesh_gemstones.py b/add_mesh_extra_objects/add_mesh_gemstones.py index 68a7a3f2..a927c6ed 100644 --- a/add_mesh_extra_objects/add_mesh_gemstones.py +++ b/add_mesh_extra_objects/add_mesh_gemstones.py @@ -279,7 +279,7 @@ class AddDiamond(Operator, object_utils.AddObjectHelper): box.prop(self, 'rotation') def execute(self, context): - + if bpy.context.mode == "OBJECT": if context.selected_objects != [] and context.active_object and \ ('Diamond' in context.active_object.data.keys()) and (self.change == True): @@ -296,7 +296,7 @@ class AddDiamond(Operator, object_utils.AddObjectHelper): mesh.from_pydata(verts, [], faces) mesh.update() obj.data = mesh - + for material in oldmesh.materials: obj.data.materials.append(material) @@ -317,7 +317,7 @@ class AddDiamond(Operator, object_utils.AddObjectHelper): obj.data["change"] = False for prm in DiamondParameters(): obj.data[prm] = getattr(self, prm) - + if bpy.context.mode == "EDIT_MESH": active_object = context.active_object name_active_object = active_object.name @@ -329,7 +329,7 @@ class AddDiamond(Operator, object_utils.AddObjectHelper): self.pavilion_height) obj = create_mesh_object(context, verts, [], faces, "TMP") - + obj.select_set(True) active_object.select_set(True) bpy.ops.object.join() @@ -368,7 +368,7 @@ class AddGem(Operator, object_utils.AddObjectHelper): change : BoolProperty(name = "Change", default = False, description = "change Gem") - + segments: IntProperty( name="Segments", description="Longitudial segmentation", @@ -420,9 +420,9 @@ class AddGem(Operator, object_utils.AddObjectHelper): box.prop(self, 'align') box.prop(self, 'location') box.prop(self, 'rotation') - + def execute(self, context): - + if bpy.context.mode == "OBJECT": if context.selected_objects != [] and context.active_object and \ ('Gem' in context.active_object.data.keys()) and (self.change == True): @@ -459,7 +459,7 @@ class AddGem(Operator, object_utils.AddObjectHelper): obj.data["change"] = False for prm in GemParameters(): obj.data[prm] = getattr(self, prm) - + if bpy.context.mode == "EDIT_MESH": active_object = context.active_object name_active_object = active_object.name @@ -472,7 +472,7 @@ class AddGem(Operator, object_utils.AddObjectHelper): self.crown_height) obj = create_mesh_object(context, verts, [], faces, "TMP") - + obj.select_set(True) active_object.select_set(True) bpy.ops.object.join() diff --git a/add_mesh_extra_objects/add_mesh_pipe_joint.py b/add_mesh_extra_objects/add_mesh_pipe_joint.py index 36c3be02..8c972614 100644 --- a/add_mesh_extra_objects/add_mesh_pipe_joint.py +++ b/add_mesh_extra_objects/add_mesh_pipe_joint.py @@ -112,7 +112,7 @@ class AddElbowJoint(Operator, object_utils.AddObjectHelper): change : BoolProperty(name = "Change", default = False, description = "change ElbowJoint") - + radius: FloatProperty( name="Radius", description="The radius of the pipe", @@ -224,7 +224,7 @@ class AddElbowJoint(Operator, object_utils.AddObjectHelper): # Create faces faces.extend(createFaces(loop1, loop2, closed=True)) faces.extend(createFaces(loop2, loop3, closed=True)) - + if bpy.context.mode == "OBJECT": if (context.selected_objects != []) and context.active_object and \ ('ElbowJoint' in context.active_object.data.keys()) and (self.change == True): @@ -294,7 +294,7 @@ class AddTeeJoint(Operator, object_utils.AddObjectHelper): change : BoolProperty(name = "Change", default = False, description = "change TeeJoint") - + radius: FloatProperty( name="Radius", description="The radius of the pipe", @@ -483,7 +483,7 @@ class AddTeeJoint(Operator, object_utils.AddObjectHelper): faces.extend(createFaces(loopMainStart, loopJoint1, closed=True)) faces.extend(createFaces(loopJoint2, loopArm, closed=True)) faces.extend(createFaces(loopJoint3, loopMainEnd, closed=True)) - + if bpy.context.mode == "OBJECT": if (context.selected_objects != []) and context.active_object and \ ('TeeJoint' in context.active_object.data.keys()) and (self.change == True): @@ -551,7 +551,7 @@ class AddWyeJoint(Operator, object_utils.AddObjectHelper): change : BoolProperty(name = "Change", default = False, description = "change WyeJoint") - + radius: FloatProperty( name="Radius", description="The radius of the pipe", @@ -759,7 +759,7 @@ class AddWyeJoint(Operator, object_utils.AddObjectHelper): faces.extend(createFaces(loopMainStart, loopJoint1, closed=True)) faces.extend(createFaces(loopJoint2, loopArm1, closed=True)) faces.extend(createFaces(loopJoint3, loopArm2, closed=True)) - + if bpy.context.mode == "OBJECT": if (context.selected_objects != []) and context.active_object and \ ('WyeJoint' in context.active_object.data.keys()) and (self.change == True): @@ -831,7 +831,7 @@ class AddCrossJoint(Operator, object_utils.AddObjectHelper): change : BoolProperty(name = "Change", default = False, description = "change CrossJoint") - + radius: FloatProperty( name="Radius", description="The radius of the pipe", @@ -1099,7 +1099,7 @@ class AddCrossJoint(Operator, object_utils.AddObjectHelper): faces.extend(createFaces(loopJoint2, loopArm1, closed=True)) faces.extend(createFaces(loopJoint3, loopArm2, closed=True)) faces.extend(createFaces(loopJoint4, loopArm3, closed=True)) - + if bpy.context.mode == "OBJECT": if (context.selected_objects != []) and context.active_object and \ ('CrossJoint' in context.active_object.data.keys()) and (self.change == True): @@ -1166,7 +1166,7 @@ class AddNJoint(Operator, object_utils.AddObjectHelper): change : BoolProperty(name = "Change", default = False, description = "change NJoint") - + radius: FloatProperty( name="Radius", description="The radius of the pipe", @@ -1336,7 +1336,7 @@ class AddNJoint(Operator, object_utils.AddObjectHelper): faces.extend( createFaces(loopsJoints[loopIdx], loopsEndCircles[loopIdx], closed=True)) - + if bpy.context.mode == "OBJECT": if (context.selected_objects != []) and context.active_object and \ ('NJoint' in context.active_object.data.keys()) and (self.change == True): diff --git a/add_mesh_extra_objects/add_mesh_round_brilliant.py b/add_mesh_extra_objects/add_mesh_round_brilliant.py index cb5e5736..233177ab 100644 --- a/add_mesh_extra_objects/add_mesh_round_brilliant.py +++ b/add_mesh_extra_objects/add_mesh_round_brilliant.py @@ -225,7 +225,7 @@ def add_mesh_Brilliant(context, s, table_w, crown_h, girdle_t, pavi_d, bezel_f, dmesh = bpy.data.meshes.new("dmesh") dmesh.from_pydata(Verts, [], Faces) dmesh.update() - + return dmesh # object generating function, returns final object @@ -321,7 +321,7 @@ class MESH_OT_primitive_brilliant_add(Operator, object_utils.AddObjectHelper): change : BoolProperty(name = "Change", default = False, - description = "change Brilliant") + description = "change Brilliant") s: IntProperty( name="Segments", @@ -428,7 +428,7 @@ class MESH_OT_primitive_brilliant_add(Operator, object_utils.AddObjectHelper): # call mesh/object generator function with user inputs def execute(self, context): - + if bpy.context.mode == "OBJECT": if context.selected_objects != [] and context.active_object and \ ('Brilliant' in context.active_object.data.keys()) and (self.change == True): @@ -457,7 +457,7 @@ class MESH_OT_primitive_brilliant_add(Operator, object_utils.AddObjectHelper): obj.data["change"] = False for prm in BrilliantParameters(): obj.data[prm] = getattr(self, prm) - + if bpy.context.mode == "EDIT_MESH": active_object = context.active_object name_active_object = active_object.name diff --git a/add_mesh_extra_objects/utils.py b/add_mesh_extra_objects/utils.py index f9b6675e..9d3ec43d 100644 --- a/add_mesh_extra_objects/utils.py +++ b/add_mesh_extra_objects/utils.py @@ -27,7 +27,7 @@ def setlocation(oper, context): bpy.ops.transform.rotate(value = oper.rotation[0], orient_axis = 'X', orient_type='GLOBAL') bpy.ops.transform.rotate(value = oper.rotation[1], orient_axis = 'Y', orient_type='GLOBAL') bpy.ops.transform.rotate(value = oper.rotation[2], orient_axis = 'Z', orient_type='GLOBAL') - + elif oper.align == "VIEW": bpy.ops.transform.translate(value = oper.location) bpy.ops.transform.rotate(value = oper.rotation[0], orient_axis = 'X') |