[Bf-extensions-cvs] [fbfa11df] master: Cleanup: trailing space
Campbell Barton
noreply at git.blender.org
Wed Feb 16 05:30:27 CET 2022
Commit: fbfa11df47d570c293e309759d3423e4079422d7
Author: Campbell Barton
Date: Wed Feb 16 15:30:11 2022 +1100
Branches: master
https://developer.blender.org/rBAfbfa11df47d570c293e309759d3423e4079422d7
Cleanup: trailing space
===================================================================
M add_curve_extra_objects/__init__.py
M curve_tools/__init__.py
M io_mesh_atomic/__init__.py
M io_scene_gltf2/blender/exp/gltf2_blender_gather_materials_pbr_metallic_roughness.py
M io_scene_gltf2/blender/imp/gltf2_blender_image.py
M io_scene_gltf2/blender/imp/gltf2_blender_node.py
M mesh_looptools.py
M mesh_tools/__init__.py
M render_povray/base_ui.py
M render_povray/render.py
M render_povray/scripting_gui.py
M rigify/__init__.py
M rigify/generate.py
===================================================================
diff --git a/add_curve_extra_objects/__init__.py b/add_curve_extra_objects/__init__.py
index 9f04e1dd..1e8406b8 100644
--- a/add_curve_extra_objects/__init__.py
+++ b/add_curve_extra_objects/__init__.py
@@ -1,5 +1,5 @@
# SPDX-License-Identifier: GPL-2.0-or-later
-#
+#
# Contributed to by:
# testscreenings, Alejandro Omar Chocano Vasquez, Jimmy Hazevoet, meta-androcto
# Cmomoney, Jared Forsyth, Adam Newgas, Spivak Vladimir, Jared Forsyth, Atom
diff --git a/curve_tools/__init__.py b/curve_tools/__init__.py
index 641fac2f..4512ab93 100644
--- a/curve_tools/__init__.py
+++ b/curve_tools/__init__.py
@@ -1,5 +1,5 @@
# SPDX-License-Identifier: GPL-2.0-or-later
-#
+#
# Contributed to by guy lateur, Alexander Meißner (Lichtso),
# Dealga McArdle (zeffii), Marvin.K.Breuer (MKB),
# Spivak Vladimir (cwolf3d)
diff --git a/io_mesh_atomic/__init__.py b/io_mesh_atomic/__init__.py
index 45f51985..9fed6c99 100644
--- a/io_mesh_atomic/__init__.py
+++ b/io_mesh_atomic/__init__.py
@@ -1,5 +1,5 @@
# SPDX-License-Identifier: GPL-2.0-or-later
-#
+#
#
# Author : Clemens Barth (Blendphys at root-1.de)
# Homepage(Wiki) : http://development.root-1.de/Atomic_Blender.php
diff --git a/io_scene_gltf2/blender/exp/gltf2_blender_gather_materials_pbr_metallic_roughness.py b/io_scene_gltf2/blender/exp/gltf2_blender_gather_materials_pbr_metallic_roughness.py
index aa0b7b7a..3e18dbad 100755
--- a/io_scene_gltf2/blender/exp/gltf2_blender_gather_materials_pbr_metallic_roughness.py
+++ b/io_scene_gltf2/blender/exp/gltf2_blender_gather_materials_pbr_metallic_roughness.py
@@ -42,7 +42,7 @@ def __gather_base_color_factor(blender_material, export_settings):
alpha_socket = gltf2_blender_get.get_socket(blender_material, "Alpha")
if isinstance(alpha_socket, bpy.types.NodeSocket):
- if export_settings['gltf_image_format'] != "NONE":
+ if export_settings['gltf_image_format'] != "NONE":
alpha = gltf2_blender_get.get_factor_from_socket(alpha_socket, kind='VALUE')
else:
alpha = gltf2_blender_get.get_const_from_default_value_socket(alpha_socket, kind='VALUE')
diff --git a/io_scene_gltf2/blender/imp/gltf2_blender_image.py b/io_scene_gltf2/blender/imp/gltf2_blender_image.py
index 4e8c5250..4f9af799 100755
--- a/io_scene_gltf2/blender/imp/gltf2_blender_image.py
+++ b/io_scene_gltf2/blender/imp/gltf2_blender_image.py
@@ -76,7 +76,7 @@ def create_from_file(gltf, img_idx):
blender_image.name = img_name
return blender_image
-
+
def create_from_data(gltf, img_idx):
# Image stored as data => pack
diff --git a/io_scene_gltf2/blender/imp/gltf2_blender_node.py b/io_scene_gltf2/blender/imp/gltf2_blender_node.py
index 06a2cb41..917c6cee 100755
--- a/io_scene_gltf2/blender/imp/gltf2_blender_node.py
+++ b/io_scene_gltf2/blender/imp/gltf2_blender_node.py
@@ -121,7 +121,7 @@ class BlenderNode():
vnode = gltf.vnodes[vid]
dist = vnode.trs()[0].length
sizes.append(dist * 0.4)
- return max(min(sizes, default=1), 0.001)
+ return max(min(sizes, default=1), 0.001)
@staticmethod
def create_bones(gltf, arma_id):
diff --git a/mesh_looptools.py b/mesh_looptools.py
index 4a874a79..5bd663d4 100644
--- a/mesh_looptools.py
+++ b/mesh_looptools.py
@@ -1,5 +1,5 @@
# SPDX-License-Identifier: GPL-2.0-or-later
-#
+#
# Contributed to Germano Cavalcante (mano-wii), Florian Meyer (testscreenings),
# Brendon Murphy (meta-androcto),
# Maintainer: Vladimir Spivak (cwolf3d)
diff --git a/mesh_tools/__init__.py b/mesh_tools/__init__.py
index 022d649f..e1af3c8a 100644
--- a/mesh_tools/__init__.py
+++ b/mesh_tools/__init__.py
@@ -1,5 +1,5 @@
# SPDX-License-Identifier: GPL-2.0-or-later
-#
+#
# Contributed to by:
# meta-androcto, Hidesato Ikeya, zmj100, Gert De Roost, TrumanBlending, PKHG, #
# Oscurart, Greg, Stanislav Blinov, komi3D, BlenderLab, Paul Marshall (brikbot), #
diff --git a/render_povray/base_ui.py b/render_povray/base_ui.py
index 9dea6039..5ecf53b6 100755
--- a/render_povray/base_ui.py
+++ b/render_povray/base_ui.py
@@ -55,9 +55,9 @@ def pov_centric_moray_like_workspace(dummy):
# we put all within a Try... Except AttributeErrors ? Any better solution ?
# Should it simply not run when opening existing file? be a preferences operator to create
# Moray like workspace
-
+
available_workspaces = bpy.data.workspaces
-
+
if all(tabs in available_workspaces for tabs in ['POV-Mo', 'POV-Ed']):
print("\nPOV-Mo and POV-Ed tabs respectively provide GUI and TEXT\n"
"oriented POV workspaces akin to Moray and POVWIN")
diff --git a/render_povray/render.py b/render_povray/render.py
index 929bcab0..0f7da3c6 100755
--- a/render_povray/render.py
+++ b/render_povray/render.py
@@ -495,36 +495,36 @@ def write_pov(filename, scene=None, info_callback=None):
'''
meta = ob.data
-
+
# important because no elements will break parsing.
elements = [elem for elem in meta.elements if elem.type in {'BALL', 'ELLIPSOID'}]
-
+
if elements:
tab_write("blob {\n")
tab_write("threshold %.4g\n" % meta.threshold)
importance = ob.pov.importance_value
-
+
try:
material = meta.materials[0] # lame! - blender cant do enything else.
except:
material = None
-
+
for elem in elements:
loc = elem.co
-
+
stiffness = elem.stiffness
if elem.use_negative:
stiffness = - stiffness
-
+
if elem.type == 'BALL':
-
+
tab_write("sphere { <%.6g, %.6g, %.6g>, %.4g, %.4g }\n" %
(loc.x, loc.y, loc.z, elem.radius, stiffness))
-
+
# After this wecould do something simple like...
# "pigment {Blue} }"
# except we'll write the color
-
+
elif elem.type == 'ELLIPSOID':
# location is modified by scale
tab_write("sphere { <%.6g, %.6g, %.6g>, %.4g, %.4g }\n" %
@@ -534,7 +534,7 @@ def write_pov(filename, scene=None, info_callback=None):
elem.radius, stiffness))
tab_write("scale <%.6g, %.6g, %.6g> \n" %
(elem.size_x, elem.size_y, elem.size_z))
-
+
if material:
diffuse_color = material.diffuse_color
trans = 1.0 - material.pov.alpha
@@ -543,30 +543,30 @@ def write_pov(filename, scene=None, info_callback=None):
trans = (1.0 - material.pov.alpha) - pov_filter
else:
pov_filter = 0.0
-
+
material_finish = material_names_dictionary[material.name]
-
+
tab_write("pigment {srgbft<%.3g, %.3g, %.3g, %.3g, %.3g>} \n" %
(diffuse_color[0], diffuse_color[1], diffuse_color[2],
pov_filter, trans))
tab_write("finish {%s}\n" % safety(material_finish, ref_level_bound=2))
-
+
else:
tab_write("pigment {srgb 1} \n")
# Write the finish last.
tab_write("finish {%s}\n" % (safety(DEF_MAT_NAME, ref_level_bound=2)))
-
+
write_object_material_interior(material, elems[1])
-
+
write_matrix(global_matrix @ ob.matrix_world)
# Importance for radiosity sampling added here
tab_write("radiosity { \n")
# importance > ob.pov.importance_value
tab_write("importance %3g \n" % importance)
tab_write("}\n")
-
+
tab_write("}\n") # End of Metaball block
-
+
if comments and len(metas) >= 1:
file.write("\n")
'''
diff --git a/render_povray/scripting_gui.py b/render_povray/scripting_gui.py
index a3af52ed..0ca2d949 100755
--- a/render_povray/scripting_gui.py
+++ b/render_povray/scripting_gui.py
@@ -122,7 +122,7 @@ class TEXT_MT_POV_insert(Menu):
prop = self.layout.operator("wm.path_open", text="Open folder", icon='FILE_FOLDER')
prop.filepath = pov_documents
self.layout.separator()
-
+
# todo: structure submenus by dir
pov_insert_items_list = [root for root, dirs, files in os.walk(pov_documents)]
print(pov_insert_items_list)
diff --git a/rigify/__init__.py b/rigify/__init__.py
index 1c9b1fa4..4f31459b 100644
--- a/rigify/__init__.py
+++ b/rigify/__init__.py
@@ -138,7 +138,7 @@ class RigifyFeatureSets(bpy.types.PropertyGroup):
context.preferences.addons[__package__].preferences.update_external_rigs()
enabled: bpy.props.BoolProperty(
- name = "Enabled",
+ name = "Enabled",
description = "Whether this feature-set is registered or not",
update = toggle_featureset,
default = True
@@ -177,7 +177,7 @@ class RigifyPreferences(AddonPreferences):
module_names = feature_set_list.get_installed_modules_names()
- # If there is a feature set preferences entry with no corresponding
+ # If there is a feature set preferences entry with no corresponding
# installed module, user must've manually removed it from the filesystem,
# so let's remove such entries.
to_delete = [ i for i, fs in enumerate(feature_set_prefs) if fs.module_name not in module_names ]
diff --git a/rigify/generate.py b/rigify/generate.py
index b3707a7e..0d99b708 100644
--- a/rigify/generate.py
+++ b/rigify/generate.py
@@ -130,7 +130,7 @@ class Generator(base_generate.BaseGenerator):
if old_collec
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-extensions-cvs
mailing list