[Bf-extensions-cvs] [6598f0a2] master: Cleanup: trailing space
Campbell Barton
noreply at git.blender.org
Wed Jan 29 03:52:54 CET 2020
Commit: 6598f0a25cb0485c6e6fa66964c2d74bf80ff705
Author: Campbell Barton
Date: Wed Jan 29 13:51:36 2020 +1100
Branches: master
https://developer.blender.org/rBA6598f0a25cb0485c6e6fa66964c2d74bf80ff705
Cleanup: trailing space
===================================================================
M add_curve_extra_objects/__init__.py
M add_curve_extra_objects/add_curve_aceous_galore.py
M add_curve_extra_objects/add_curve_braid.py
M add_curve_extra_objects/add_curve_celtic_links.py
M add_curve_extra_objects/add_curve_curly.py
M add_curve_extra_objects/add_curve_simple.py
M add_curve_extra_objects/add_curve_spirals.py
M add_curve_extra_objects/add_curve_torus_knots.py
M add_curve_extra_objects/beveltaper_curve.py
M add_mesh_BoltFactory/Boltfactory.py
M add_mesh_BoltFactory/__init__.py
M add_mesh_discombobulator/__init__.py
M add_mesh_discombobulator/mesh_discombobulator.py
M add_mesh_extra_objects/Wallfactory.py
M add_mesh_extra_objects/__init__.py
M add_mesh_extra_objects/add_mesh_3d_function_surface.py
M add_mesh_extra_objects/add_mesh_beam_builder.py
M add_mesh_extra_objects/add_mesh_gears.py
M add_mesh_extra_objects/add_mesh_gemstones.py
M add_mesh_extra_objects/add_mesh_honeycomb.py
M add_mesh_extra_objects/add_mesh_pipe_joint.py
M add_mesh_extra_objects/add_mesh_pyramid.py
M add_mesh_extra_objects/add_mesh_round_brilliant.py
M add_mesh_extra_objects/add_mesh_round_cube.py
M add_mesh_extra_objects/add_mesh_star.py
M add_mesh_extra_objects/add_mesh_supertoroid.py
M add_mesh_extra_objects/add_mesh_torusknot.py
M add_mesh_extra_objects/add_mesh_twisted_torus.py
M add_mesh_geodesic_domes/__init__.py
M add_mesh_geodesic_domes/third_domes_panel_271.py
M amaranth/modeling/symmetry_tools.py
M amaranth/render/samples_scene.py
M animation_add_corrective_shape_key.py
M blenderkit/autothumb.py
M btrace/bTrace.py
M curve_assign_shapekey.py
M curve_simplify.py
M curve_tools/__init__.py
M curve_tools/cad.py
M curve_tools/fillet.py
M curve_tools/operators.py
M curve_tools/outline.py
M curve_tools/path_finder.py
M curve_tools/remove_doubles.py
M curve_tools/show_resolution.py
M curve_tools/splines_sequence.py
M curve_tools/util.py
M development_edit_operator.py
M io_coat3D/__init__.py
M io_coat3D/tex.py
M io_curve_svg/import_svg.py
M io_export_dxf/__init__.py
M io_export_dxf/export_dxf.py
M io_export_dxf/primitive_exporters/mesh_exporter.py
M io_export_paper_model.py
M io_mesh_atomic/__init__.py
M io_mesh_atomic/utility_gui.py
M io_scene_gltf2/blender/exp/gltf2_blender_gather_materials_pbr_metallic_roughness.py
M magic_uv/lib/bglx.py
M mesh_auto_mirror.py
M mesh_bsurfaces.py
M mesh_looptools.py
M mesh_tiny_cad/E2F.py
M mesh_tools/__init__.py
M mesh_tools/mesh_edge_roundifier.py
M mesh_tools/mesh_offset_edges.py
M node_arrange.py
M object_edit_linked.py
M oscurart_tools/__init__.py
M oscurart_tools/files/save_incremental.py
M oscurart_tools/mesh/apply_linked_meshes.py
M oscurart_tools/mesh/flipped_uvs.py
M oscurart_tools/mesh/vertex_color_id.py
M oscurart_tools/object/search_and_select.py
M oscurart_tools/render/batch_maker.py
M oscurart_tools/render/material_overrides.py
M oscurart_tools/render/render_tokens.py
M power_sequencer/operators/swap_strips.py
M presets/pov/light/17_(1700K)_135W_Low_Pressure_Sodium.py
M presets/pov/world/4_Cartoony_Sky.py
M presets/pov/world/5_Under_Water.py
M space_view3d_brush_menus/__init__.py
M space_view3d_brush_menus/brush_menu.py
M space_view3d_brush_menus/brushes.py
M space_view3d_pie_menus/pie_apply_transform_menu.py
M space_view3d_pie_menus/pie_editor_switch_menu.py
M space_view3d_pie_menus/pie_modes_menu.py
M space_view3d_pie_menus/pie_origin.py
M space_view3d_pie_menus/pie_proportional_menu.py
M space_view3d_spacebar_menu/__init__.py
===================================================================
diff --git a/add_curve_extra_objects/__init__.py b/add_curve_extra_objects/__init__.py
index e64944fe..1e63e812 100644
--- a/add_curve_extra_objects/__init__.py
+++ b/add_curve_extra_objects/__init__.py
@@ -276,7 +276,7 @@ def register():
from bpy.utils import register_class
for cls in classes:
register_class(cls)
-
+
add_curve_simple.register()
add_curve_spirals.register()
add_curve_aceous_galore.register()
@@ -287,7 +287,7 @@ def register():
add_curve_spirofit_bouncespline.register()
add_surface_plane_cone.register()
beveltaper_curve.register()
-
+
# Add "Extras" menu to the "Add Curve" menu
bpy.types.VIEW3D_MT_curve_add.append(menu_func)
# Add "Extras" menu to the "Add Surface" menu
@@ -299,7 +299,7 @@ def unregister():
bpy.types.VIEW3D_MT_curve_add.remove(menu_func)
# Remove "Extras" menu from the "Add Surface" menu.
bpy.types.VIEW3D_MT_surface_add.remove(menu_surface)
-
+
add_surface_plane_cone.unregister()
add_curve_spirofit_bouncespline.unregister()
add_curve_curly.unregister()
@@ -310,7 +310,7 @@ def unregister():
add_curve_spirals.unregister()
add_curve_simple.unregister()
beveltaper_curve.unregister()
-
+
from bpy.utils import unregister_class
for cls in reversed(classes):
unregister_class(cls)
diff --git a/add_curve_extra_objects/add_curve_aceous_galore.py b/add_curve_extra_objects/add_curve_aceous_galore.py
index 493b38d1..46530d10 100644
--- a/add_curve_extra_objects/add_curve_aceous_galore.py
+++ b/add_curve_extra_objects/add_curve_aceous_galore.py
@@ -744,10 +744,10 @@ def vertsToPoints(Verts, splineType):
def createCurve(context, vertArray, self):
# output splineType 'POLY' 'NURBS' 'BEZIER'
splineType = self.outputType
-
+
# GalloreType as name
name = self.ProfileType
-
+
# create object
if bpy.context.mode == 'EDIT_CURVE':
Curve = context.active_object
@@ -756,15 +756,15 @@ def createCurve(context, vertArray, self):
# create curve
dataCurve = bpy.data.curves.new(name, type='CURVE') # curve data block
newSpline = dataCurve.splines.new(type=splineType) # spline
-
+
# create object with newCurve
Curve = object_utils.object_data_add(context, dataCurve, operator=self) # place in active scene
-
+
# set newSpline Options
newSpline.use_cyclic_u = self.use_cyclic_u
newSpline.use_endpoint_u = self.endp_u
newSpline.order_u = self.order_u
-
+
# set curve Options
Curve.data.dimensions = self.shape
Curve.data.use_path = True
@@ -782,7 +782,7 @@ def createCurve(context, vertArray, self):
else:
for point in spline.points:
point.select = False
-
+
# create spline from vertarray
if splineType == 'BEZIER':
newSpline.bezier_points.add(int(len(vertArray) * 0.33))
@@ -799,7 +799,7 @@ def createCurve(context, vertArray, self):
newSpline.use_endpoint_u = True
for point in newSpline.points:
point.select = True
-
+
# move and rotate spline in edit mode
if bpy.context.mode == 'EDIT_CURVE':
if self.align == "WORLD":
@@ -808,7 +808,7 @@ def createCurve(context, vertArray, self):
bpy.ops.transform.rotate(value = self.rotation[0], orient_axis = 'X', orient_type='GLOBAL')
bpy.ops.transform.rotate(value = self.rotation[1], orient_axis = 'Y', orient_type='GLOBAL')
bpy.ops.transform.rotate(value = self.rotation[2], orient_axis = 'Z', orient_type='GLOBAL')
-
+
elif self.align == "VIEW":
bpy.ops.transform.translate(value = self.location)
bpy.ops.transform.rotate(value = self.rotation[0], orient_axis = 'X')
@@ -1425,12 +1425,12 @@ class Curveaceous_galore(Operator, object_utils.AddObjectHelper):
row = layout.row()
row.prop(self, "shape", expand=True)
-
+
# output options
col = layout.column()
col.label(text="Output Curve Type:")
col.row().prop(self, "outputType", expand=True)
-
+
if self.outputType == 'NURBS':
col.prop(self, 'order_u')
elif self.outputType == 'BEZIER':
@@ -1441,7 +1441,7 @@ class Curveaceous_galore(Operator, object_utils.AddObjectHelper):
col = layout.column()
col.row().prop(self, "edit_mode", expand=True)
-
+
col = layout.column()
# AddObjectHelper props
col.prop(self, "align")
@@ -1456,13 +1456,13 @@ class Curveaceous_galore(Operator, object_utils.AddObjectHelper):
# turn off 'Enter Edit Mode'
use_enter_edit_mode = bpy.context.preferences.edit.use_enter_edit_mode
bpy.context.preferences.edit.use_enter_edit_mode = False
-
+
# main function
main(context, self)
-
+
if use_enter_edit_mode:
bpy.ops.object.mode_set(mode = 'EDIT')
-
+
# restore pre operator state
bpy.context.preferences.edit.use_enter_edit_mode = use_enter_edit_mode
@@ -1470,9 +1470,9 @@ class Curveaceous_galore(Operator, object_utils.AddObjectHelper):
bpy.ops.object.mode_set(mode = 'EDIT')
else:
bpy.ops.object.mode_set(mode = 'OBJECT')
-
+
return {'FINISHED'}
-
+
def invoke(self, context, event):
# deal with 2D - 3D curve differences
if self.ProfileType in ['Helix', 'Cycloid', 'Noise']:
@@ -1492,7 +1492,7 @@ class Curveaceous_galore(Operator, object_utils.AddObjectHelper):
self.use_cyclic_u = False
else:
self.use_cyclic_u = True
-
+
self.execute(context)
return {'FINISHED'}
diff --git a/add_curve_extra_objects/add_curve_braid.py b/add_curve_extra_objects/add_curve_braid.py
index ae250682..8041b4bf 100644
--- a/add_curve_extra_objects/add_curve_braid.py
+++ b/add_curve_extra_objects/add_curve_braid.py
@@ -232,7 +232,7 @@ class Braid(Operator):
col.label(text="Geometry Options:")
col.prop(self, "strandsize")
col.prop(self, "resolution")
-
+
col = layout.column()
col.row().prop(self, "edit_mode", expand=True)
@@ -240,7 +240,7 @@ class Braid(Operator):
# turn off 'Enter Edit Mode'
use_enter_edit_mode = bpy.context.preferences.edit.use_enter_edit_mode
bpy.context.preferences.edit.use_enter_edit_mode = False
-
+
circle = defaultCircle(self.strandsize)
context.scene.collection.objects.link(circle)
braid = awesome_braid(
@@ -258,10 +258,10 @@ class Braid(Operator):
ob.select_set(False)
braid.select_set(True)
bpy.context.view_layer.objects.active = braid
-
+
if use_enter_edit_mode:
bpy.ops.object.mode_set(mode = 'EDIT')
-
+
# restore pre operator state
bpy.context.preferences.edit.use_enter_edit_mode = use_enter_edit_mode
diff --git a/add_curve_extra_objects/add_curve_celtic_links.py b/add_curve_extra_objects/add_curve_celtic_links.py
index 87b778fe..d3136bdb 100644
--- a/add_curve_extra_objects/add_curve_celtic_links.py
+++ b/add_curve_extra_objects/add_curve_celtic_links.py
@@ -125,7 +125,7 @@ class CelticKnotOperator(Operator):
# turn off 'Enter Edit Mode'
use_enter_edit_mode = bpy.context.preferences.edit.use_enter_edit_mode
bpy.context.preferences.edit.use_enter_edit_mode = False
-
+
# Cache some values
s = sin(self.crossing_angle) * self.crossing_strength
c = cos(self.crossing_angle) * self.crossing_strength
@@ -271,9 +271,9 @@ class CelticKnotOperator(Operator):
curve_obj.data.bevel_depth = self.geo_bDepth
except:
pass
-
+
bpy.context.view_layer.objects.active = orig_obj
-
+
# restore pre operator state
bpy.context.preferences.edit.use_enter_edit_mode = use_enter_edit_mode
diff --git a/add_curve_extra_objects/add_curve_curly.py b/add_curve_extra_objects/add_curve_curly.py
index 65990ee2..637269b5 100644
--- a/add_curve_extra_objects/add_curve_curly.py
+++ b/add_curve_extra_objects/add_curve_curly.py
@@ -388,7 +388,7 @@ def make_curve(self, context, verts, lh, rh):
# create object
if bpy.context.mode == 'EDIT_CURVE':
Curve = context.active_object
-
+
for spline in Curve.data.splines:
if spline.type == 'BEZIER':
for point in spline.bezier_points:
@@ -417,7 +417,7 @@ def make_curve(self, context, verts, lh, rh):
# something weird with this one
if types == 1 or types == 2 or types == 3:
newSpline.bezier_points[3].handle_left.xyz = lh[p][3]
-
+
else:
# create curve
dataCurve = bpy.data.curves.new(name='CurlyCurve', type='CURVE') # curvedatablock
@@ -438,8 +438,8 @@ def make_curve(self, context, verts, lh, rh):
c += 1
# something weird with this one
if types == 1 or types == 2 or types == 3:
- newSpline.bezier_points[3].handle_left.xyz = lh[p][3]
-
+ newSpline.bezier_points[3].handle_left.xyz = lh[p][3]
+
# create object with newCurve
Curve = object_data_add(context, dataCurve, operator=self) # place in active scene
Curve.select_set(True)
@@ -451,7 +451,7 @@ def make_curve(self, context, verts, lh, rh):
Curve.data.fill_mode = 'FULL'
else:
Curve.data.fill_mode = 'BOTH'
-
+
# move and rotate spline in edit mode
if bpy.context.mode == 'EDIT_CURVE':
if self.align == "WORLD":
@@ -460,7 +460,7 @@ def make_curve(self, context, verts, lh, rh):
bpy.ops.transform.rotate(value = self.rotation[0], orient_axis = 'X', orient_type='GLOBAL')
bpy.ops.transform.rotate(value = self.rotation[1], orient_axis = 'Y', orient_type='GLOBAL')
bpy.ops.transform.rotate(value = self.rotation[2], orient_
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-extensions-cvs
mailing list