[Bf-extensions-cvs] [fe59d382] master: Cleanup: trailing space
Campbell Barton
noreply at git.blender.org
Tue Jan 31 05:48:30 CET 2023
Commit: fe59d382b4fd2047920208fa92d39fc1361d9242
Author: Campbell Barton
Date: Tue Jan 31 15:47:58 2023 +1100
Branches: master
https://developer.blender.org/rBAfe59d382b4fd2047920208fa92d39fc1361d9242
Cleanup: trailing space
===================================================================
M greasepencil_tools/prefs.py
M io_scene_gltf2/__init__.py
M io_scene_gltf2/blender/com/gltf2_blender_conversion.py
M io_scene_gltf2/blender/com/gltf2_blender_data_path.py
M io_scene_gltf2/blender/com/gltf2_blender_ui.py
M io_scene_gltf2/blender/exp/gltf2_blender_gather_image.py
M io_scene_gltf2/blender/exp/gltf2_blender_gather_materials.py
M io_scene_gltf2/blender/exp/gltf2_blender_gather_materials_clearcoat.py
M io_scene_gltf2/blender/exp/gltf2_blender_gather_materials_emission.py
M io_scene_gltf2/blender/exp/gltf2_blender_gather_materials_ior.py
M io_scene_gltf2/blender/exp/gltf2_blender_gather_materials_sheen.py
M io_scene_gltf2/blender/exp/gltf2_blender_gather_materials_specular.py
M io_scene_gltf2/blender/exp/gltf2_blender_gather_materials_transmission.py
M io_scene_gltf2/blender/exp/gltf2_blender_gather_nodes.py
M io_scene_gltf2/blender/exp/gltf2_blender_gather_primitives_extract.py
M io_scene_gltf2/blender/exp/gltf2_blender_gather_texture_info.py
M io_scene_gltf2/blender/exp/gltf2_blender_get.py
M io_scene_gltf2/blender/exp/gltf2_blender_texture_specular.py
M io_scene_gltf2/blender/imp/gltf2_blender_KHR_materials_sheen.py
M io_scene_gltf2/blender/imp/gltf2_blender_KHR_materials_specular.py
M io_scene_gltf2/blender/imp/gltf2_blender_image.py
M io_scene_gltf2/blender/imp/gltf2_blender_mesh.py
M io_scene_gltf2/blender/imp/gltf2_blender_pbrMetallicRoughness.py
M io_scene_gltf2/io/com/gltf2_io_constants.py
M render_povray/model_meta_topology.py
M viewport_vr_preview/gui.py
===================================================================
diff --git a/greasepencil_tools/prefs.py b/greasepencil_tools/prefs.py
index 2c9545b0..0918a7a8 100644
--- a/greasepencil_tools/prefs.py
+++ b/greasepencil_tools/prefs.py
@@ -60,7 +60,7 @@ class GreasePencilAddonPrefs(bpy.types.AddonPreferences):
('layer_navigator', 'Layer Navigator', 'Layer Navigation tool shortcut and prefs', 3),
),
)
-
+
# --- props
use_clic_drag : BoolProperty(
@@ -153,7 +153,7 @@ class GreasePencilAddonPrefs(bpy.types.AddonPreferences):
row = layout.row(align=True)
row.prop(self, "pref_tab", expand=True)
-
+
if self.pref_tab == 'box_deform':
## BOX DEFORM
@@ -213,7 +213,7 @@ class GreasePencilAddonPrefs(bpy.types.AddonPreferences):
## SCRUB TIMELINE
box = layout.box()
draw_ts_pref(prefs.ts, box)
-
+
if self.pref_tab == 'layer_navigator':
## LAYER NAVIGATOR
box = layout.box()
diff --git a/io_scene_gltf2/__init__.py b/io_scene_gltf2/__init__.py
index b637f353..507c1d34 100755
--- a/io_scene_gltf2/__init__.py
+++ b/io_scene_gltf2/__init__.py
@@ -360,7 +360,7 @@ class ExportGLTF2_Base(ConvertGLTF2_Base):
use_active_collection: BoolProperty(
name='Active Collection',
description='Export objects in the active collection only',
- default=False
+ default=False
)
use_active_scene: BoolProperty(
@@ -626,7 +626,7 @@ class ExportGLTF2_Base(ConvertGLTF2_Base):
export_settings['gltf_visible'] = self.use_visible
export_settings['gltf_renderable'] = self.use_renderable
-
+
export_settings['gltf_active_collection'] = self.use_active_collection
if self.use_active_collection:
export_settings['gltf_active_collection_with_nested'] = self.use_active_collection_with_nested
diff --git a/io_scene_gltf2/blender/com/gltf2_blender_conversion.py b/io_scene_gltf2/blender/com/gltf2_blender_conversion.py
index 4cc46e5c..11622ee3 100755
--- a/io_scene_gltf2/blender/com/gltf2_blender_conversion.py
+++ b/io_scene_gltf2/blender/com/gltf2_blender_conversion.py
@@ -125,4 +125,4 @@ def get_attribute_type(component_type, data_type):
gltf2_io_constants.ComponentType.UnsignedShort: "BYTE_COLOR"
}[component_type]
else:
- pass
\ No newline at end of file
+ pass
diff --git a/io_scene_gltf2/blender/com/gltf2_blender_data_path.py b/io_scene_gltf2/blender/com/gltf2_blender_data_path.py
index 9aeeb5dc..410f3058 100755
--- a/io_scene_gltf2/blender/com/gltf2_blender_data_path.py
+++ b/io_scene_gltf2/blender/com/gltf2_blender_data_path.py
@@ -44,4 +44,4 @@ def get_delta_modes(target_property: str) -> str:
return target_property.startswith("delta_")
def is_bone_anim_channel(data_path: str) -> bool:
- return data_path[:10] == "pose.bones"
\ No newline at end of file
+ return data_path[:10] == "pose.bones"
diff --git a/io_scene_gltf2/blender/com/gltf2_blender_ui.py b/io_scene_gltf2/blender/com/gltf2_blender_ui.py
index efec00a3..eb44420f 100644
--- a/io_scene_gltf2/blender/com/gltf2_blender_ui.py
+++ b/io_scene_gltf2/blender/com/gltf2_blender_ui.py
@@ -10,7 +10,7 @@ def create_gltf_ao_group(operator, group_name):
# create a new group
gltf_ao_group = bpy.data.node_groups.new(group_name, "ShaderNodeTree")
-
+
return gltf_ao_group
class NODE_OT_GLTF_SETTINGS(bpy.types.Operator):
@@ -143,8 +143,8 @@ class SCENE_OT_gltf2_variant_remove(bpy.types.Operator):
if len(remove_idx_data) > 0:
for idx_data in remove_idx_data:
mesh.gltf2_variant_mesh_data.remove(idx_data)
-
- return {'FINISHED'}
+
+ return {'FINISHED'}
# Operator to display a variant
diff --git a/io_scene_gltf2/blender/exp/gltf2_blender_gather_image.py b/io_scene_gltf2/blender/exp/gltf2_blender_gather_image.py
index 6f31bd8d..9cd60d11 100755
--- a/io_scene_gltf2/blender/exp/gltf2_blender_gather_image.py
+++ b/io_scene_gltf2/blender/exp/gltf2_blender_gather_image.py
@@ -187,7 +187,7 @@ def __get_image_data(sockets, export_settings) -> ExportImage:
return __get_image_data_specular(sockets, results, export_settings)
else:
return __get_image_data_mapping(sockets, results, export_settings)
-
+
def __get_image_data_mapping(sockets, results, export_settings) -> ExportImage:
"""
Simple mapping
@@ -266,7 +266,7 @@ def __get_image_data_mapping(sockets, results, export_settings) -> ExportImage:
def __get_image_data_specular(sockets, results, export_settings) -> ExportImage:
"""
calculating Specular Texture, settings needed data
- """
+ """
from io_scene_gltf2.blender.exp.gltf2_blender_texture_specular import specular_calculation
composed_image = ExportImage()
composed_image.set_calc(specular_calculation)
diff --git a/io_scene_gltf2/blender/exp/gltf2_blender_gather_materials.py b/io_scene_gltf2/blender/exp/gltf2_blender_gather_materials.py
index edbb1354..5914ebe9 100755
--- a/io_scene_gltf2/blender/exp/gltf2_blender_gather_materials.py
+++ b/io_scene_gltf2/blender/exp/gltf2_blender_gather_materials.py
@@ -261,7 +261,7 @@ def __gather_extensions(blender_material, emissive_factor, export_settings):
sheen_extension, use_actives_uvmap_sheen = export_sheen(blender_material, export_settings)
if sheen_extension:
extensions["KHR_materials_sheen"] = sheen_extension
- actives_uvmaps.extend(use_actives_uvmap_sheen)
+ actives_uvmaps.extend(use_actives_uvmap_sheen)
# KHR_materials_ior
# Keep this extension at the end, because we export it only if some others are exported
diff --git a/io_scene_gltf2/blender/exp/gltf2_blender_gather_materials_clearcoat.py b/io_scene_gltf2/blender/exp/gltf2_blender_gather_materials_clearcoat.py
index 65c164b4..811dccf2 100644
--- a/io_scene_gltf2/blender/exp/gltf2_blender_gather_materials_clearcoat.py
+++ b/io_scene_gltf2/blender/exp/gltf2_blender_gather_materials_clearcoat.py
@@ -78,4 +78,4 @@ def export_clearcoat(blender_material, export_settings):
if clearcoat_normal_texture_use_active_uvmap:
use_actives_uvmaps.append("clearcoatNormalTexture")
- return Extension('KHR_materials_clearcoat', clearcoat_extension, False), use_actives_uvmaps
\ No newline at end of file
+ return Extension('KHR_materials_clearcoat', clearcoat_extension, False), use_actives_uvmaps
diff --git a/io_scene_gltf2/blender/exp/gltf2_blender_gather_materials_emission.py b/io_scene_gltf2/blender/exp/gltf2_blender_gather_materials_emission.py
index 562fc19d..7e8368ba 100644
--- a/io_scene_gltf2/blender/exp/gltf2_blender_gather_materials_emission.py
+++ b/io_scene_gltf2/blender/exp/gltf2_blender_gather_materials_emission.py
@@ -58,4 +58,4 @@ def export_emission_strength_extension(emissive_factor, export_settings):
emissive_strength_extension = {}
emissive_strength_extension['emissiveStrength'] = max(emissive_factor)
- return Extension('KHR_materials_emissive_strength', emissive_strength_extension, False)
\ No newline at end of file
+ return Extension('KHR_materials_emissive_strength', emissive_strength_extension, False)
diff --git a/io_scene_gltf2/blender/exp/gltf2_blender_gather_materials_ior.py b/io_scene_gltf2/blender/exp/gltf2_blender_gather_materials_ior.py
index fc219c01..3c6c2c27 100644
--- a/io_scene_gltf2/blender/exp/gltf2_blender_gather_materials_ior.py
+++ b/io_scene_gltf2/blender/exp/gltf2_blender_gather_materials_ior.py
@@ -32,4 +32,4 @@ def export_ior(blender_material, extensions, export_settings):
ior_extension = {}
ior_extension['ior'] = ior_socket.default_value
- return Extension('KHR_materials_ior', ior_extension, False)
\ No newline at end of file
+ return Extension('KHR_materials_ior', ior_extension, False)
diff --git a/io_scene_gltf2/blender/exp/gltf2_blender_gather_materials_sheen.py b/io_scene_gltf2/blender/exp/gltf2_blender_gather_materials_sheen.py
index 1d4fb5b9..dae74f63 100644
--- a/io_scene_gltf2/blender/exp/gltf2_blender_gather_materials_sheen.py
+++ b/io_scene_gltf2/blender/exp/gltf2_blender_gather_materials_sheen.py
@@ -33,7 +33,7 @@ def export_sheen(blender_material, export_settings):
fac = [1.0, 1.0, 1.0] # Default is 0.0/0.0/0.0, so we need to set it to 1 if no factor
if fac is not None and fac != [0.0, 0.0, 0.0]:
sheen_extension['sheenColorFactor'] = fac
-
+
# Texture
if gltf2_blender_get.has_image_node_from_socket(sheenColor_socket):
original_sheenColor_texture, original_sheenColor_use_active_uvmap, _ = gltf2_blender_gather_texture_info.gather_texture_info(
@@ -57,7 +57,7 @@ def export_sheen(blender_material, export_settings):
fac = 1.0 # Default is 0.0 so we need to set it to 1.0 if no factor
if fac is not None and fac != 0.0:
sheen_extension['sheenRoughnessFactor'] = fac
-
+
# Texture
if gltf2_blender_get.has_image_node_from_socket(sheenRoughness_socket):
original_sheenRoughness_texture, original_sheenRoughness_use_active_uvmap, _ = gltf2_blender_gather_texture_info.gather_texture_info(
@@ -68,5 +68,5 @@ def export_sheen(blender_material, export_settings):
sheen_extension['sheenRoughnessTexture'] = original_sheenRoughness_texture
if original_sheenRoughness_use_active_uvmap:
use_actives_uvmaps.append("sheenRoughnessTexture")
-
+
return Extension('KHR_materials_sheen', sheen_extension, False), use_actives_uvmaps
diff --git a/io_scene_gltf2/blender/exp/gltf2_blender_gather_materials_specular.py b/io_scene_gltf2/blender/exp/gltf2_blender_gather_materials_specular.py
index 9e0318ce..4e47bae9 100644
--- a/io_scene_gltf2/blender/exp/gltf2_blender_gather_materials_specular.py
+++ b/io_scene_gltf2/blender/exp/gltf2_blender_gather_materials_specular.py
@@ -34,7 +34,7 @@ def export_original_specular(blender_material, export_settings):
fac = gltf2_blender_get.get_factor_from_socket(original_specular_socket, kind='VALUE')
if fac is
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-extensions-cvs
mailing list