From 1d91e8c12a25618c308fcd25108bf36af0f27094 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Wed, 1 Dec 2021 09:58:31 +1100
Subject: [PATCH] Cleanup: trailing space & tabs to spaces
---
add_mesh_extra_objects/add_mesh_gears.py | 8 +-
greasepencil_tools/box_deform.py | 4 +-
greasepencil_tools/prefs.py | 2 +-
greasepencil_tools/timeline_scrub.py | 10 +--
io_anim_bvh/import_bvh.py | 2 +-
io_export_dxf/export_dxf.py | 80 +++++++++----------
io_import_dxf/dxfgrabber/dxfentities.py | 40 +++++-----
io_scene_x3d/import_x3d.py | 8 +-
mesh_looptools.py | 2 +-
mesh_tools/mesh_relax.py | 2 +-
pose_library/gui.py | 1 -
precision_drawing_tools/pdt_command.py | 2 +-
.../pdt_command_functions.py | 2 +-
precision_drawing_tools/pdt_design.py | 2 +-
precision_drawing_tools/pdt_exception.py | 2 +-
precision_drawing_tools/pdt_functions.py | 2 +-
precision_drawing_tools/pdt_library.py | 2 +-
precision_drawing_tools/pdt_menus.py | 2 +-
precision_drawing_tools/pdt_msg_strings.py | 2 +-
precision_drawing_tools/pdt_pivot_point.py | 2 +-
precision_drawing_tools/pdt_tangent.py | 2 +-
precision_drawing_tools/pdt_trig_waves.py | 2 +-
precision_drawing_tools/pdt_view.py | 2 +-
presets/pov/light/24_(1850K)_Candle.py | 20 ++---
real_snow.py | 4 +-
rigify/utils/mechanism.py | 2 +-
system_blend_info.py | 2 +-
viewport_vr_preview/action_map.py | 8 +-
viewport_vr_preview/action_map_io.py | 8 +-
viewport_vr_preview/configs/default.py | 36 ++++-----
viewport_vr_preview/defaults.py | 32 ++++----
viewport_vr_preview/operators.py | 4 +-
viewport_vr_preview/versioning.py | 4 +-
33 files changed, 151 insertions(+), 152 deletions(-)
diff --git a/add_mesh_extra_objects/add_mesh_gears.py b/add_mesh_extra_objects/add_mesh_gears.py
index 1d3bc70ec..4d9f01683 100644
--- a/add_mesh_extra_objects/add_mesh_gears.py
+++ b/add_mesh_extra_objects/add_mesh_gears.py
@@ -93,13 +93,13 @@ def createFaces(vertIdx1, vertIdx2, closed=False, flipped=False):
# Calculate the vertex coordinates for a single
# section of a gear tooth.
# Returns 4 lists of vertex coords (list of tuples):
-# *-*---*---* (1.) verts_inner_base
+# *-*---*---* (1.) verts_inner_base
# | | | |
-# *-*---*---* (2.) verts_outer_base
+# *-*---*---* (2.) verts_outer_base
# | | |
-# *---*---* (3.) verts_middle_tooth
+# *---*---* (3.) verts_middle_tooth
# \ | /
-# *-*-* (4.) verts_tip_tooth
+# *-*-* (4.) verts_tip_tooth
#
# a
# t
diff --git a/greasepencil_tools/box_deform.py b/greasepencil_tools/box_deform.py
index 607d8a7d8..4c2de720b 100644
--- a/greasepencil_tools/box_deform.py
+++ b/greasepencil_tools/box_deform.py
@@ -333,7 +333,7 @@ def cancel_cage(self):
self.gp_obj.grease_pencil_modifiers.remove(mod)
else:
print(f'tmp_lattice modifier not found to remove on {self.gp_obj.name}')
-
+
for ob in self.other_gp:
mod = ob.grease_pencil_modifiers.get('tmp_lattice')
if mod:
@@ -586,7 +586,7 @@ valid:Spacebar/Enter, cancel:Del/Backspace/Tab/Ctrl+T"
## silent return
return {'CANCELLED'}
-
+
# bpy.ops.ed.undo_push(message="Box deform step")#don't work as expected (+ might be obsolete)
# https://developer.blender.org/D6147 <- undo forget
diff --git a/greasepencil_tools/prefs.py b/greasepencil_tools/prefs.py
index 929197d51..11d3d0be7 100644
--- a/greasepencil_tools/prefs.py
+++ b/greasepencil_tools/prefs.py
@@ -89,7 +89,7 @@ class GreasePencilAddonPrefs(bpy.types.AddonPreferences):
name = "Use Hud",
description = "Display angle lines and angle value as text on viewport",
default = False)
-
+
canvas_use_view_center: BoolProperty(
name = "Rotate From View Center In Camera",
description = "Rotate from view center in camera view, Else rotate from camera center",
diff --git a/greasepencil_tools/timeline_scrub.py b/greasepencil_tools/timeline_scrub.py
index 9946975eb..f6ba9eaa1 100644
--- a/greasepencil_tools/timeline_scrub.py
+++ b/greasepencil_tools/timeline_scrub.py
@@ -211,7 +211,7 @@ class GPTS_OT_time_scrub(bpy.types.Operator):
else:
self.init_index = 0
self.init_frame = self.new_frame = self.pos[0]
-
+
# del active_pos
self.index_limit = len(self.pos) - 1
@@ -311,14 +311,14 @@ class GPTS_OT_time_scrub(bpy.types.Operator):
shader = gpu.shader.from_builtin('2D_UNIFORM_COLOR') # initiate shader
self.batch_timeline = batch_for_shader(
shader, 'LINES', {"pos": self.hud_lines})
-
+
if self.rolling_mode:
current_id = self.pos.index(self.new_frame)
# Add init_frame to "cancel" it in later UI code
ui_key_pos = [i - current_id + self.init_frame for i, _f in enumerate(self.pos[:-2])]
else:
ui_key_pos = self.pos[:-2]
-
+
# keyframe display
if self.keyframe_aspect == 'LINE':
@@ -725,7 +725,7 @@ def draw_ts_pref(prefs, layout):
snap_text = 'Disable keyframes snap: '
else:
snap_text = 'Keyframes snap: '
-
+
snap_text += 'Left Mouse' if prefs.keycode == 'RIGHTMOUSE' else 'Right Mouse'
if not prefs.use_ctrl:
snap_text += ' or Ctrl'
@@ -733,7 +733,7 @@ def draw_ts_pref(prefs, layout):
snap_text += ' or Shift'
if not prefs.use_alt:
snap_text += ' or Alt'
-
+
if prefs.rolling_mode:
snap_text = 'Gap-less mode (always snap)'
diff --git a/io_anim_bvh/import_bvh.py b/io_anim_bvh/import_bvh.py
index e43b6090c..4710a137c 100644
--- a/io_anim_bvh/import_bvh.py
+++ b/io_anim_bvh/import_bvh.py
@@ -320,7 +320,7 @@ def read_bvh(context, file_path, rotate_mode='XYZ', global_scale=1.0):
else:
# allow this, see above
# if not bvh_node.children:
- # raise Exception("bvh node has no end and no children. bad file")
+ # raise Exception("bvh node has no end and no children. bad file")
# Removed temp for now
rest_tail_world = Vector((0.0, 0.0, 0.0))
diff --git a/io_export_dxf/export_dxf.py b/io_export_dxf/export_dxf.py
index 71434a716..c4088c6da 100644
--- a/io_export_dxf/export_dxf.py
+++ b/io_export_dxf/export_dxf.py
@@ -64,10 +64,10 @@ def exportDXF(context, filePath, settings):
if not drawing.isEmpty():
# NOTE: Only orthographic projection used now.
- # if PERSPECTIVE: # generate view border - passepartout
- # from .primitive_exporters.viewborder_exporter import ViewBorderDXFExporter
- # e = ViewBorderDXFExporter(settings)
- # e.export(drawing, ob, mx, mw)
+ # if PERSPECTIVE: # generate view border - passepartout
+ # from .primitive_exporters.viewborder_exporter import ViewBorderDXFExporter
+ # e = ViewBorderDXFExporter(settings)
+ # e.export(drawing, ob, mx, mw)
drawing.convert(filePath)
@@ -172,38 +172,38 @@ def getCommons(ob, settings):
def getCameraMatrix(cam):
raise NotImplementedError()
-# camProps = cam.data
-# mc0 = act_camera.matrix.copy()
-# #print 'deb: camera.Matrix=\n', mc0 #------------------
-# camera = Camera.Get(act_camera.getData(name_only=True))
-# #print 'deb: camera=', dir(camera) #------------------
-# if camera.type=='persp': PERSPECTIVE = 1
-# elif camera.type=='ortho': PERSPECTIVE = 0
-# # mcp is matrix.camera.perspective
-# clip_box, mcp = getClipBox(camera)
-## if PERSPECTIVE:
-## # get border
-## # lens = camera.lens
-## min_X1, max_X1, min_Y1, max_Y1,\
-## min_X2, max_X2, min_Y2, max_Y2,\
-## min_Z, max_Z = clip_box
-## verts = []
-## verts.append([min_X1, min_Y1, min_Z])
-## verts.append([max_X1, min_Y1, min_Z])
-## verts.append([max_X1, max_Y1, min_Z])
-## verts.append([min_X1, max_Y1, min_Z])
-## border=verts
-# mw = mc0.copy().invert()
-# #ViewVector = mathutils.Vector(Window.GetViewVector())
-# #print 'deb: ViewVector=\n', ViewVector #------------------
-# #TODO: what is Window.GetViewOffset() for?
-# #print 'deb: Window.GetViewOffset():', Window.GetViewOffset() #---------
-# #Window.SetViewOffset([0,0,0])
-# mw0 = Window.GetViewMatrix()
-# #print 'deb: mwOrtho =\n', mw0 #---------
-# mwp = Window.GetPerspMatrix() #TODO: how to get it working?
-# #print 'deb: mwPersp =\n', mwp #---------
-# mw = mw0.copy()
+# camProps = cam.data
+# mc0 = act_camera.matrix.copy()
+# #print 'deb: camera.Matrix=\n', mc0 #------------------
+# camera = Camera.Get(act_camera.getData(name_only=True))
+# #print 'deb: camera=', dir(camera) #------------------
+# if camera.type=='persp': PERSPECTIVE = 1
+# elif camera.type=='ortho': PERSPECTIVE = 0
+# # mcp is matrix.camera.perspective
+# clip_box, mcp = getClipBox(camera)
+## if PERSPECTIVE:
+## # get border
+## # lens = camera.lens
+## min_X1, max_X1, min_Y1, max_Y1,\
+## min_X2, max_X2, min_Y2, max_Y2,\
+## min_Z, max_Z = clip_box
+## verts = []
+## verts.append([min_X1, min_Y1, min_Z])
+## verts.append([max_X1, min_Y1, min_Z])
+## verts.append([max_X1, max_Y1, min_Z])
+## verts.append([min_X1, max_Y1, min_Z])
+## border=verts
+# mw = mc0.copy().invert()
+# #ViewVector = mathutils.Vector(Window.GetViewVector())
+# #print 'deb: ViewVector=\n', ViewVector #------------------
+# #TODO: what is Window.GetViewOffset() for?
+# #print 'deb: Window.GetViewOffset():', Window.GetViewOffset() #---------
+# #Window.SetViewOffset([0,0,0])
+# mw0 = Window.GetViewMatrix()
+# #print 'deb: mwOrtho =\n', mw0 #---------
+# mwp = Window.GetPerspMatrix() #TODO: how to get it working?
+# #print 'deb: mwPersp =\n', mwp #---------
+# mw = mw0.copy()
projectionMapping = {
'TOP' : mathutils.Vector((0, 0, -1)),
@@ -241,10 +241,10 @@ def _exportItem(ctx, o, mw, drawing, settings):
"""
if settings['verbose']: print('Exporting %s' % o)
#mx = ob.matrix.copy()
- #print 'deb: ob =', ob #---------
- #print 'deb: ob.type =', ob.type #---------
- #print 'deb: mx =\n', mx #---------
- #print 'deb: mw0 =\n', mw0 #---------
+ #print 'deb: ob =', ob #---------
+ #print 'deb: ob.type =', ob.type #---------
+ #print 'deb: mx =\n', mx #---------
+ #print 'deb: mw0 =\n', mw0 #---------
#mx_n is trans-matrix for normal_vectors for front-side faces
mx = o.matrix_world
viewRotation = mw.to_euler().to_matrix()
diff --git a/io_import_dxf/dxfgrabber/dxfentities.py b/io_import_dxf/dxfgrabber/dxfentities.py
index 61ff351c3..ea2eb9d01 100644
--- a/io_import_dxf/dxfgrabber/dxfentities.py
+++ b/io_import_dxf/dxfgrabber/dxfentities.py
@@ -739,24 +739,24 @@ def normalized(vector):
##################################################
# MTEXT inline codes
-# \L Start underline
-# \l Stop underline
-# \O Start overstrike
-# \o Stop overstrike
-# \K Start strike-through
-# \k Stop strike-through
-# \P New paragraph (new line)
-# \pxi Control codes for bullets, numbered paragraphs and columns
-# \X Paragraph wrap on the dimension line (only in dimensions)
-# \Q Slanting (obliquing) text by angle - e.g. \Q30;
-# \H Text height - e.g. \H3x;
-# \W Text width - e.g. \W0.8x;
-# \F Font selection
+# \L Start underline
+# \l Stop underline
+# \O Start overstrike
+# \o Stop overstrike
+# \K Start strike-through
+# \k Stop strike-through
+# \P New paragraph (new line)
+# \pxi Control codes for bullets, numbered paragraphs and columns
+# \X Paragraph wrap on the dimension line (only in dimensions)
+# \Q Slanting (obliquing) text by angle - e.g. \Q30;
+# \H Text height - e.g. \H3x;
+# \W Text width - e.g. \W0.8x;
+# \F Font selection
#
# e.g. \Fgdt;o - GDT-tolerance
# e.g. \Fkroeger|b0|i0|c238|p10 - font Kroeger, non-bold, non-italic, codepage 238, pitch 10
#
-# \S Stacking, fractions
+# \S Stacking, fractions
#
# e.g. \SA^B:
# A
@@ -768,13 +768,13 @@ def normalized(vector):
# e.g. \S1#4:
# 1/4
#
-# \A Alignment
+# \A Alignment
#
# \A0; = bottom
# \A1; = center
# \A2; = top
#
-# \C Color change
+# \C Color change
#
# \C1; = red
# \C2; = yellow
@@ -784,10 +784,10 @@ def normalized(vector):
# \C6; = magenta
# \C7; = white
#
-# \T Tracking, char.spacing - e.g. \T2;
-# \~ Non-wrapping space, hard space
-# {} Braces - define the text area influenced by the code
-# \ Escape character - e.g. \\ = "\", \{ = "{"
+# \T Tracking, char.spacing - e.g. \T2;
+# \~ Non-wrapping space, hard space
+# {} Braces - define the text area influenced by the code
+# \ Escape character - e.g. \\ = "\", \{ = "{"
#
# Codes and braces can be nested up to 8 levels deep
diff --git a/io_scene_x3d/import_x3d.py b/io_scene_x3d/import_x3d.py
index df5fbb467..6ca3ffc87 100644
--- a/io_scene_x3d/import_x3d.py
+++ b/io_scene_x3d/import_x3d.py
@@ -2738,7 +2738,7 @@ def appearance_CreateMaterial(vrmlname, mat, ancestry, is_vcol):
if alpha < 1.0:
bpymat.blend_method = "BLEND"
bpymat.shadow_method = "HASHED"
-
+
# NOTE - leaving this disabled for now
if False and is_vcol:
node_vertex_color = bpymat.node_tree.nodes.new("ShaderNodeVertexColor")
@@ -2748,7 +2748,7 @@ def appearance_CreateMaterial(vrmlname, mat, ancestry, is_vcol):
bpymat_wrap.node_principled_bsdf.inputs["Base Color"],
node_vertex_color.outputs["Color"]
)
-
+
return bpymat_wrap
@@ -2769,7 +2769,7 @@ def appearance_CreateDefaultMaterial():
#bpymat.specular_hardness = 103
# 0-1 -> 1-511
#bpymat.specular_color = (0, 0, 0)
-
+
bpymat_wrap.alpha = 1.0
return bpymat_wrap
@@ -2902,7 +2902,7 @@ def appearance_Create(vrmlname, material, tex_node, ancestry, node, is_vcol):
repeatT = tex_node.getFieldAsBool('repeatT', True, ancestry)
bpymat_wrap.base_color_texture.image = bpyima
-
+
# NOTE - not possible to handle x and y tiling individually.
extension = "REPEAT" if repeatS or repeatT else "CLIP"
bpymat_wrap.base_color_texture.extension = extension
diff --git a/mesh_looptools.py b/mesh_looptools.py
index 5e0988b5d..3927c8869 100644
--- a/mesh_looptools.py
+++ b/mesh_looptools.py
@@ -17,7 +17,7 @@
# ##### END GPL LICENSE BLOCK #####
# Contributed to Germano Cavalcante (mano-wii), Florian Meyer (testscreenings),
# Brendon Murphy (meta-androcto),
-# Maintainer: Vladimir Spivak (cwolf3d)
+# Maintainer: Vladimir Spivak (cwolf3d)
# Originally an addon by Bart Crouch
bl_info = {
diff --git a/mesh_tools/mesh_relax.py b/mesh_tools/mesh_relax.py
index c646e81bf..03547769e 100644
--- a/mesh_tools/mesh_relax.py
+++ b/mesh_tools/mesh_relax.py
@@ -12,7 +12,7 @@
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
diff --git a/pose_library/gui.py b/pose_library/gui.py
index e648de15a..c31d8ca16 100644
--- a/pose_library/gui.py
+++ b/pose_library/gui.py
@@ -281,4 +281,3 @@ def unregister() -> None:
bpy.types.UI_MT_list_item_context_menu.remove(pose_library_list_item_context_menu)
bpy.types.ASSETBROWSER_MT_context_menu.remove(pose_library_list_item_context_menu)
-
diff --git a/precision_drawing_tools/pdt_command.py b/precision_drawing_tools/pdt_command.py
index 0085e560f..1f10e3ffc 100644
--- a/precision_drawing_tools/pdt_command.py
+++ b/precision_drawing_tools/pdt_command.py
@@ -8,7 +8,7 @@
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
diff --git a/precision_drawing_tools/pdt_command_functions.py b/precision_drawing_tools/pdt_command_functions.py
index e499a71a7..7087f6fa9 100644
--- a/precision_drawing_tools/pdt_command_functions.py
+++ b/precision_drawing_tools/pdt_command_functions.py
@@ -8,7 +8,7 @@
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
diff --git a/precision_drawing_tools/pdt_design.py b/precision_drawing_tools/pdt_design.py
index d8caa455c..e4a0cdeb6 100644
--- a/precision_drawing_tools/pdt_design.py
+++ b/precision_drawing_tools/pdt_design.py
@@ -8,7 +8,7 @@
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
diff --git a/precision_drawing_tools/pdt_exception.py b/precision_drawing_tools/pdt_exception.py
index 601f51413..3d83bb944 100644
--- a/precision_drawing_tools/pdt_exception.py
+++ b/precision_drawing_tools/pdt_exception.py
@@ -8,7 +8,7 @@
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
diff --git a/precision_drawing_tools/pdt_functions.py b/precision_drawing_tools/pdt_functions.py
index 38879618f..fb73b7654 100644
--- a/precision_drawing_tools/pdt_functions.py
+++ b/precision_drawing_tools/pdt_functions.py
@@ -8,7 +8,7 @@
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
diff --git a/precision_drawing_tools/pdt_library.py b/precision_drawing_tools/pdt_library.py
index 6ec81d69d..f3855f4a1 100644
--- a/precision_drawing_tools/pdt_library.py
+++ b/precision_drawing_tools/pdt_library.py
@@ -8,7 +8,7 @@
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
diff --git a/precision_drawing_tools/pdt_menus.py b/precision_drawing_tools/pdt_menus.py
index 73c2d642b..603b43793 100644
--- a/precision_drawing_tools/pdt_menus.py
+++ b/precision_drawing_tools/pdt_menus.py
@@ -8,7 +8,7 @@
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
diff --git a/precision_drawing_tools/pdt_msg_strings.py b/precision_drawing_tools/pdt_msg_strings.py
index a5eb3d996..65a113b26 100644
--- a/precision_drawing_tools/pdt_msg_strings.py
+++ b/precision_drawing_tools/pdt_msg_strings.py
@@ -8,7 +8,7 @@
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
diff --git a/precision_drawing_tools/pdt_pivot_point.py b/precision_drawing_tools/pdt_pivot_point.py
index 357b57358..749417abe 100644
--- a/precision_drawing_tools/pdt_pivot_point.py
+++ b/precision_drawing_tools/pdt_pivot_point.py
@@ -8,7 +8,7 @@
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
diff --git a/precision_drawing_tools/pdt_tangent.py b/precision_drawing_tools/pdt_tangent.py
index 22b34c7a2..5b6243d5a 100644
--- a/precision_drawing_tools/pdt_tangent.py
+++ b/precision_drawing_tools/pdt_tangent.py
@@ -8,7 +8,7 @@
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
diff --git a/precision_drawing_tools/pdt_trig_waves.py b/precision_drawing_tools/pdt_trig_waves.py
index 535ac85a9..2409ca2f0 100644
--- a/precision_drawing_tools/pdt_trig_waves.py
+++ b/precision_drawing_tools/pdt_trig_waves.py
@@ -8,7 +8,7 @@
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
diff --git a/precision_drawing_tools/pdt_view.py b/precision_drawing_tools/pdt_view.py
index 352620ffd..835904956 100644
--- a/precision_drawing_tools/pdt_view.py
+++ b/precision_drawing_tools/pdt_view.py
@@ -8,7 +8,7 @@
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
diff --git a/presets/pov/light/24_(1850K)_Candle.py b/presets/pov/light/24_(1850K)_Candle.py
index 31e960fc6..c608c7203 100644
--- a/presets/pov/light/24_(1850K)_Candle.py
+++ b/presets/pov/light/24_(1850K)_Candle.py
@@ -8,17 +8,17 @@ lampdata.color = (1.0, 0.7176470756530762, 0.2980392277240753)
#lampdata.color = (1.0, 0.5764706134796143, 0.16078431904315948)
#http://terpconnect.umd.edu/~pbs/2011-Sunderland-et-al-PCI.pdf
#https://blog.1000bulbs.com/home/whats-the-difference-between-candela-lux-and-lumens
-#Environment Typical Lux
-#Hospital Theatre 1,000
-#Supermarket, Workshop, Sports Hall 750
-#Office, Show Rooms, Laboratories, Kitchens 500
-#Warehouse Loading Bays 300 to 400
-#School Classroom, University Lecture Hall 250
-#Lobbies, Public Corridors, Stairwells 200
-#Warehouse Aisles 100 to 200
-#Homes, Theatres 150
+#Environment Typical Lux
+#Hospital Theatre 1,000
+#Supermarket, Workshop, Sports Hall 750
+#Office, Show Rooms, Laboratories, Kitchens 500
+#Warehouse Loading Bays 300 to 400
+#School Classroom, University Lecture Hall 250
+#Lobbies, Public Corridors, Stairwells 200
+#Warehouse Aisles 100 to 200
+#Homes, Theatres 150
#Family Living Room 50
-#Sunset & Sunrise 400 lux
+#Sunset & Sunrise 400 lux
lampdata.energy = 2.0 #two times lux value
lampdata.distance = 0.004
lampdata.falloff_type = 'INVERSE_SQUARE'
diff --git a/real_snow.py b/real_snow.py
index 8f1b9ffd1..c0c51aebf 100644
--- a/real_snow.py
+++ b/real_snow.py
@@ -238,13 +238,13 @@ def add_material(obj: bpy.types.Object):
mat_name = "Snow"
# If material doesn't exist, create it
if mat_name in bpy.data.materials:
- bpy.data.materials[mat_name].name = mat_name+".001"
+ bpy.data.materials[mat_name].name = mat_name+".001"
mat = bpy.data.materials.new(mat_name)
mat.use_nodes = True
nodes = mat.node_tree.nodes
# Delete all nodes
for node in nodes:
- nodes.remove(node)
+ nodes.remove(node)
# Add nodes
output = nodes.new('ShaderNodeOutputMaterial')
principled = nodes.new('ShaderNodeBsdfPrincipled')
diff --git a/rigify/utils/mechanism.py b/rigify/utils/mechanism.py
index 0b5c8d932..930309b39 100644
--- a/rigify/utils/mechanism.py
+++ b/rigify/utils/mechanism.py
@@ -474,7 +474,7 @@ def copy_custom_properties(src, dest, *, prefix='', dest_prefix='', link_driver=
try:
ui_data_src = src.id_properties_ui(key)
except TypeError:
- # Some property types, eg. Python dictionaries
+ # Some property types, eg. Python dictionaries
# don't support id_properties_ui.
continue
diff --git a/system_blend_info.py b/system_blend_info.py
index 7f574cf71..03522d2b5 100644
--- a/system_blend_info.py
+++ b/system_blend_info.py
@@ -11,7 +11,7 @@
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
diff --git a/viewport_vr_preview/action_map.py b/viewport_vr_preview/action_map.py
index 49c3f7dd7..f0ffc0464 100644
--- a/viewport_vr_preview/action_map.py
+++ b/viewport_vr_preview/action_map.py
@@ -62,10 +62,10 @@ def vr_create_actions(context: bpy.context):
return
# Ensure default action maps.
- if not defaults.vr_ensure_default_actionmaps(session_state):
+ if not defaults.vr_ensure_default_actionmaps(session_state):
return
- for am in session_state.actionmaps:
+ for am in session_state.actionmaps:
if len(am.actionmap_items) < 1:
continue
@@ -79,7 +79,7 @@ def vr_create_actions(context: bpy.context):
for ami in am.actionmap_items:
if len(ami.bindings) < 1:
continue
-
+
ok = session_state.action_create(context, am, ami)
if not ok:
return
@@ -131,7 +131,7 @@ def vr_save_actionmaps(session_state, filepath, sort=False):
action_map_io.actionconfig_export_as_data(session_state, filepath, sort=sort)
print("Saved XR actionmaps: " + filepath)
-
+
return True
diff --git a/viewport_vr_preview/action_map_io.py b/viewport_vr_preview/action_map_io.py
index c57543a09..fedea82e3 100644
--- a/viewport_vr_preview/action_map_io.py
+++ b/viewport_vr_preview/action_map_io.py
@@ -77,11 +77,11 @@ def ami_args_as_data(ami):
return "{" + ", ".join(s) + "}"
-def ami_data_from_args(ami, args):
+def ami_data_from_args(ami, args):
ami.type = args["type"]
ami.user_path0 = args["user_path0"]
ami.user_path1 = args["user_path1"]
-
+
if ami.type == 'FLOAT' or ami.type == 'VECTOR2D':
ami.op = args["op"]
ami.op_mode = args["op_mode"]
@@ -168,7 +168,7 @@ def amb_args_as_data(amb, type):
return "{" + ", ".join(s) + "}"
-def amb_data_from_args(amb, args, type):
+def amb_data_from_args(amb, args, type):
amb.profile = args["profile"]
amb.component_path0 = args["component_path0"]
amb.component_path1 = args["component_path1"]
@@ -327,7 +327,7 @@ def actionconfig_init_from_data(session_state, actionconfig_data, actionconfig_v
if actionconfig_version is not None:
from .versioning import actionconfig_update
actionconfig_data = actionconfig_update(actionconfig_data, actionconfig_version)
-
+
for (am_name, am_content) in actionconfig_data:
am = session_state.actionmaps.new(session_state, am_name, True)
am_items = am_content["items"]
diff --git a/viewport_vr_preview/configs/default.py b/viewport_vr_preview/configs/default.py
index efb130c1b..bf4c46c75 100644
--- a/viewport_vr_preview/configs/default.py
+++ b/viewport_vr_preview/configs/default.py
@@ -68,7 +68,7 @@ actionconfig_data = \
[("mode", 'VIEWER_FORWARD'),
("lock_location_z", True),
],
- },
+ },
{"bindings":
[("cosmos", {"profile": '/interaction_profiles/htc/vive_cosmos_controller', "component_path0": '/input/thumbstick/y', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'POSITIVE'}),
("huawei", {"profile": '/interaction_profiles/huawei/controller', "component_path0": '/input/trackpad/y', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'POSITIVE'}),
@@ -85,7 +85,7 @@ actionconfig_data = \
[("mode", 'VIEWER_BACK'),
("lock_location_z", True),
],
- },
+ },
{"bindings":
[("cosmos", {"profile": '/interaction_profiles/htc/vive_cosmos_controller', "component_path0": '/input/thumbstick/y', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'NEGATIVE'}),
("huawei", {"profile": '/interaction_profiles/huawei/controller', "component_path0": '/input/trackpad/y', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'NEGATIVE'}),
@@ -102,7 +102,7 @@ actionconfig_data = \
[("mode", 'VIEWER_LEFT'),
("lock_location_z", True),
],
- },
+ },
{"bindings":
[("cosmos", {"profile": '/interaction_profiles/htc/vive_cosmos_controller', "component_path0": '/input/thumbstick/x', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'NEGATIVE'}),
("huawei", {"profile": '/interaction_profiles/huawei/controller', "component_path0": '/input/trackpad/x', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'NEGATIVE'}),
@@ -119,7 +119,7 @@ actionconfig_data = \
[("mode", 'VIEWER_RIGHT'),
("lock_location_z", True),
],
- },
+ },
{"bindings":
[("cosmos", {"profile": '/interaction_profiles/htc/vive_cosmos_controller', "component_path0": '/input/thumbstick/x', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'POSITIVE'}),
("huawei", {"profile": '/interaction_profiles/huawei/controller', "component_path0": '/input/trackpad/x', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'POSITIVE'}),
@@ -137,7 +137,7 @@ actionconfig_data = \
("speed_min", 0.014),
("speed_max", 0.042),
],
- },
+ },
{"bindings":
[("cosmos", {"profile": '/interaction_profiles/htc/vive_cosmos_controller', "component_path0": '/input/thumbstick/y', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'POSITIVE'}),
("huawei", {"profile": '/interaction_profiles/huawei/controller', "component_path0": '/input/trackpad/y', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'POSITIVE'}),
@@ -155,7 +155,7 @@ actionconfig_data = \
("speed_min", 0.014),
("speed_max", 0.042),
],
- },
+ },
{"bindings":
[("cosmos", {"profile": '/interaction_profiles/htc/vive_cosmos_controller', "component_path0": '/input/thumbstick/y', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'NEGATIVE'}),
("huawei", {"profile": '/interaction_profiles/huawei/controller', "component_path0": '/input/trackpad/y', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'NEGATIVE'}),
@@ -191,7 +191,7 @@ actionconfig_data = \
("speed_min", 0.01),
("speed_max", 0.03),
],
- },
+ },
{"bindings":
[("cosmos", {"profile": '/interaction_profiles/htc/vive_cosmos_controller', "component_path0": '/input/thumbstick/x', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'POSITIVE'}),
("huawei", {"profile": '/interaction_profiles/huawei/controller', "component_path0": '/input/trackpad/x', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'POSITIVE'}),
@@ -209,7 +209,7 @@ actionconfig_data = \
("rotation", False),
("scale", True),
],
- },
+ },
{"bindings":
[("cosmos", {"profile": '/interaction_profiles/htc/vive_cosmos_controller', "component_path0": '/input/x/click', "component_path1": '/input/a/click', "threshold": '0.30000001192092896', "axis_region": 'ANY'}),
("huawei", {"profile": '/interaction_profiles/huawei/controller', "component_path0": '/input/back/click', "component_path1": '/input/back/click', "threshold": '0.30000001192092896', "axis_region": 'ANY'}),
@@ -245,7 +245,7 @@ actionconfig_data = \
("from_viewer", True),
("color", (0.0, 1.0, 1.0, 1.0)),
],
- },
+ },
{"bindings":
[("gamepad", {"profile": '/interaction_profiles/microsoft/xbox_controller', "component_path0": '/input/trigger_right/value', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'ANY'}),
],
@@ -262,7 +262,7 @@ actionconfig_data = \
[("mode", 'VIEWER_FORWARD'),
("lock_location_z", True),
],
- },
+ },
{"bindings":
[("gamepad", {"profile": '/interaction_profiles/microsoft/xbox_controller', "component_path0": '/input/thumbstick_left/y', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'POSITIVE'}),
],
@@ -273,7 +273,7 @@ actionconfig_data = \
[("mode", 'VIEWER_BACK'),
("lock_location_z", True),
],
- },
+ },
{"bindings":
[("gamepad", {"profile": '/interaction_profiles/microsoft/xbox_controller', "component_path0": '/input/thumbstick_left/y', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'NEGATIVE'}),
],
@@ -284,7 +284,7 @@ actionconfig_data = \
[("mode", 'VIEWER_LEFT'),
("lock_location_z", True),
],
- },
+ },
{"bindings":
[("gamepad", {"profile": '/interaction_profiles/microsoft/xbox_controller', "component_path0": '/input/thumbstick_left/x', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'NEGATIVE'}),
],
@@ -295,7 +295,7 @@ actionconfig_data = \
[("mode", 'VIEWER_RIGHT'),
("lock_location_z", True),
],
- },
+ },
{"bindings":
[("gamepad", {"profile": '/interaction_profiles/microsoft/xbox_controller', "component_path0": '/input/thumbstick_left/x', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'POSITIVE'}),
],
@@ -307,7 +307,7 @@ actionconfig_data = \
("speed_min", 0.014),
("speed_max", 0.042),
],
- },
+ },
{"bindings":
[("gamepad", {"profile": '/interaction_profiles/microsoft/xbox_controller', "component_path0": '/input/thumbstick_right/y', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'POSITIVE'}),
],
@@ -319,7 +319,7 @@ actionconfig_data = \
("speed_min", 0.014),
("speed_max", 0.042),
],
- },
+ },
{"bindings":
[("gamepad", {"profile": '/interaction_profiles/microsoft/xbox_controller', "component_path0": '/input/thumbstick_right/y', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'NEGATIVE'}),
],
@@ -331,7 +331,7 @@ actionconfig_data = \
("speed_min", 0.01),
("speed_max", 0.03),
],
- },
+ },
{"bindings":
[("gamepad", {"profile": '/interaction_profiles/microsoft/xbox_controller', "component_path0": '/input/thumbstick_right/x', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'NEGATIVE'}),
],
@@ -343,7 +343,7 @@ actionconfig_data = \
("speed_min", 0.01),
("speed_max", 0.03),
],
- },
+ },
{"bindings":
[("gamepad", {"profile": '/interaction_profiles/microsoft/xbox_controller', "component_path0": '/input/thumbstick_right/x', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'POSITIVE'}),
],
@@ -355,7 +355,7 @@ actionconfig_data = \
("rotation", False),
("scale", True),
],
- },
+ },
{"bindings":
[("gamepad", {"profile": '/interaction_profiles/microsoft/xbox_controller', "component_path0": '/input/a/click', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'ANY'}),
],
diff --git a/viewport_vr_preview/defaults.py b/viewport_vr_preview/defaults.py
index 205e39d28..fc768b8a7 100644
--- a/viewport_vr_preview/defaults.py
+++ b/viewport_vr_preview/defaults.py
@@ -107,7 +107,7 @@ def vr_defaults_action_add(am,
ami = am.actionmap_items.new(name, True)
- if ami:
+ if ami:
ami.type = 'FLOAT'
ami.user_path0 = user_path0
ami.user_path1 = user_path1
@@ -131,7 +131,7 @@ def vr_defaults_pose_action_add(am,
is_controller_grip,
is_controller_aim):
ami = am.actionmap_items.new(name, True)
- if ami:
+ if ami:
ami.type = 'POSE'
ami.user_path0 = user_path0
ami.user_path1 = user_path1
@@ -146,11 +146,11 @@ def vr_defaults_haptic_action_add(am,
user_path0,
user_path1):
ami = am.actionmap_items.new(name, True)
- if ami:
+ if ami:
ami.type = 'VIBRATION'
ami.user_path0 = user_path0
ami.user_path1 = user_path1
-
+
return ami
@@ -162,7 +162,7 @@ def vr_defaults_actionbinding_add(ami,
threshold,
axis0_region,
axis1_region):
- amb = ami.bindings.new(name, True)
+ amb = ami.bindings.new(name, True)
if amb:
amb.profile = profile
amb.component_path0 = component_path0
@@ -181,7 +181,7 @@ def vr_defaults_pose_actionbinding_add(ami,
component_path1,
location,
rotation):
- amb = ami.bindings.new(name, True)
+ amb = ami.bindings.new(name, True)
if amb:
amb.profile = profile
amb.component_path0 = component_path0
@@ -197,7 +197,7 @@ def vr_defaults_haptic_actionbinding_add(ami,
profile,
component_path0,
component_path1):
- amb = ami.bindings.new(name, True)
+ amb = ami.bindings.new(name, True)
if amb:
amb.profile = profile
amb.component_path0 = component_path0
@@ -652,7 +652,7 @@ def vr_defaults_create_default(session_state):
False,
0.0,
0.0,
- 0.0,
+ 0.0,
'PRESS')
if ami:
vr_defaults_actionbinding_add(ami,
@@ -673,7 +673,7 @@ def vr_defaults_create_default(session_state):
'ANY')
vr_defaults_actionbinding_add(ami,
VRDefaultActionbindings.INDEX.value,
- VRDefaultActionprofiles.INDEX.value,
+ VRDefaultActionprofiles.INDEX.value,
"/input/thumbstick/x",
"",
0.3,
@@ -728,7 +728,7 @@ def vr_defaults_create_default(session_state):
if ami:
vr_defaults_actionbinding_add(ami,
VRDefaultActionbindings.COSMOS.value,
- VRDefaultActionprofiles.COSMOS.value,
+ VRDefaultActionprofiles.COSMOS.value,
"/input/thumbstick/x",
"",
0.3,
@@ -736,7 +736,7 @@ def vr_defaults_create_default(session_state):
'ANY')
vr_defaults_actionbinding_add(ami,
VRDefaultActionbindings.HUAWEI.value,
- VRDefaultActionprofiles.HUAWEI.value,
+ VRDefaultActionprofiles.HUAWEI.value,
"/input/trackpad/x",
"",
0.3,
@@ -752,7 +752,7 @@ def vr_defaults_create_default(session_state):
'ANY')
vr_defaults_actionbinding_add(ami,
VRDefaultActionbindings.OCULUS.value,
- VRDefaultActionprofiles.OCULUS.value,
+ VRDefaultActionprofiles.OCULUS.value,
"/input/thumbstick/x",
"",
0.3,
@@ -760,7 +760,7 @@ def vr_defaults_create_default(session_state):
'ANY')
vr_defaults_actionbinding_add(ami,
VRDefaultActionbindings.REVERB_G2.value,
- VRDefaultActionprofiles.REVERB_G2.value,
+ VRDefaultActionprofiles.REVERB_G2.value,
"/input/thumbstick/x",
"",
0.3,
@@ -1460,7 +1460,7 @@ def vr_defaults_create_default_gamepad(session_state):
if ami:
vr_defaults_haptic_actionbinding_add(ami,
VRDefaultActionbindings.GAMEPAD.value,
- VRDefaultActionprofiles.GAMEPAD.value,
+ VRDefaultActionprofiles.GAMEPAD.value,
"/output/haptic_right",
"")
@@ -1471,7 +1471,7 @@ def vr_defaults_create_default_gamepad(session_state):
if ami:
vr_defaults_haptic_actionbinding_add(ami,
VRDefaultActionbindings.GAMEPAD.value,
- VRDefaultActionprofiles.GAMEPAD.value,
+ VRDefaultActionprofiles.GAMEPAD.value,
"/output/haptic_left_trigger",
"")
@@ -1482,7 +1482,7 @@ def vr_defaults_create_default_gamepad(session_state):
if ami:
vr_defaults_haptic_actionbinding_add(ami,
VRDefaultActionbindings.GAMEPAD.value,
- VRDefaultActionprofiles.GAMEPAD.value,
+ VRDefaultActionprofiles.GAMEPAD.value,
"/output/haptic_right_trigger",
"")
diff --git a/viewport_vr_preview/operators.py b/viewport_vr_preview/operators.py
index 932dac315..7a19b9fb9 100644
--- a/viewport_vr_preview/operators.py
+++ b/viewport_vr_preview/operators.py
@@ -316,7 +316,7 @@ class VIEW3D_GT_vr_controller_aim(Gizmo):
def draw(self, context):
bgl.glLineWidth(1)
bgl.glEnable(bgl.GL_BLEND)
-
+
self.color = 1.0, 0.2, 0.322
self.draw_preset_arrow(self.matrix_basis, axis='POS_X')
self.color = 0.545, 0.863, 0.0
@@ -414,7 +414,7 @@ class VIEW3D_GGT_vr_controller_poses(GizmoGroup):
gizmo.aspect = 1 / 3, 1 / 4
gizmo.color_highlight = 1.0, 1.0, 1.0
gizmo.alpha = 1.0
-
+
def draw_prepare(self, context):
grip_idx = 0
aim_idx = 0
diff --git a/viewport_vr_preview/versioning.py b/viewport_vr_preview/versioning.py
index bf7e891a7..15d4de298 100644
--- a/viewport_vr_preview/versioning.py
+++ b/viewport_vr_preview/versioning.py
@@ -40,14 +40,14 @@ def actionconfig_update(actionconfig_data, actionconfig_version):
##
## for (am_name, am_content) in actionconfig_data:
## # Apply action map updates.
-##
+##
## am_items = am_content["items"]
##
## for (ami_name, ami_args, ami_data, ami_content) in am_items
## # Apply action map item updates.
##
## ami_bindings = ami_content["bindings"]
-##
+##
## for (amb_name, amb_args) in ami_bindings:
## # Apply action map binding updates.
--
GitLab