Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender-addons.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Duroure <julien.duroure@gmail.com>2020-02-22 00:27:26 +0300
committerJulien Duroure <julien.duroure@gmail.com>2020-02-22 00:27:26 +0300
commit1e5d8bd56d968ae29f7d648b95462aa8c3acecff (patch)
tree24d6c1962e80980b7d4dc05271cdb938869062b0 /io_scene_gltf2/blender/exp
parent6d119656014a3b9db0bf4a04385928f0d2fd35c5 (diff)
glTF: remove 2.79 on upstream repository
Files are no more computed to remove 2.79 code here, so some little modification on files can be found
Diffstat (limited to 'io_scene_gltf2/blender/exp')
-rwxr-xr-xio_scene_gltf2/blender/exp/gltf2_blender_export.py1
-rwxr-xr-xio_scene_gltf2/blender/exp/gltf2_blender_export_keys.py1
-rwxr-xr-xio_scene_gltf2/blender/exp/gltf2_blender_gather.py1
-rw-r--r--io_scene_gltf2/blender/exp/gltf2_blender_gather_accessors.py1
-rwxr-xr-xio_scene_gltf2/blender/exp/gltf2_blender_gather_animation_channel_target.py1
-rwxr-xr-xio_scene_gltf2/blender/exp/gltf2_blender_gather_animation_channels.py1
-rwxr-xr-xio_scene_gltf2/blender/exp/gltf2_blender_gather_animation_sampler_keyframes.py1
-rwxr-xr-xio_scene_gltf2/blender/exp/gltf2_blender_gather_animation_samplers.py1
-rwxr-xr-xio_scene_gltf2/blender/exp/gltf2_blender_gather_animations.py1
-rwxr-xr-xio_scene_gltf2/blender/exp/gltf2_blender_gather_cache.py1
-rwxr-xr-xio_scene_gltf2/blender/exp/gltf2_blender_gather_cameras.py1
-rw-r--r--io_scene_gltf2/blender/exp/gltf2_blender_gather_drivers.py1
-rwxr-xr-xio_scene_gltf2/blender/exp/gltf2_blender_gather_image.py1
-rwxr-xr-xio_scene_gltf2/blender/exp/gltf2_blender_gather_joints.py1
-rw-r--r--io_scene_gltf2/blender/exp/gltf2_blender_gather_light_spots.py1
-rw-r--r--io_scene_gltf2/blender/exp/gltf2_blender_gather_lights.py1
-rwxr-xr-xio_scene_gltf2/blender/exp/gltf2_blender_gather_material_normal_texture_info_class.py1
-rwxr-xr-xio_scene_gltf2/blender/exp/gltf2_blender_gather_material_occlusion_texture_info_class.py1
-rwxr-xr-xio_scene_gltf2/blender/exp/gltf2_blender_gather_materials.py1
-rwxr-xr-xio_scene_gltf2/blender/exp/gltf2_blender_gather_materials_pbr_metallic_roughness.py1
-rwxr-xr-xio_scene_gltf2/blender/exp/gltf2_blender_gather_mesh.py1
-rwxr-xr-xio_scene_gltf2/blender/exp/gltf2_blender_gather_nodes.py1
-rwxr-xr-xio_scene_gltf2/blender/exp/gltf2_blender_gather_primitive_attributes.py1
-rwxr-xr-xio_scene_gltf2/blender/exp/gltf2_blender_gather_primitives.py1
-rwxr-xr-xio_scene_gltf2/blender/exp/gltf2_blender_gather_sampler.py1
-rwxr-xr-xio_scene_gltf2/blender/exp/gltf2_blender_gather_skins.py1
-rwxr-xr-xio_scene_gltf2/blender/exp/gltf2_blender_gather_texture.py1
-rwxr-xr-xio_scene_gltf2/blender/exp/gltf2_blender_gather_texture_info.py1
-rwxr-xr-xio_scene_gltf2/blender/exp/gltf2_blender_get.py5
-rwxr-xr-xio_scene_gltf2/blender/exp/gltf2_blender_gltf2_exporter.py1
-rw-r--r--io_scene_gltf2/blender/exp/gltf2_blender_image.py1
-rwxr-xr-xio_scene_gltf2/blender/exp/gltf2_blender_search_node_tree.py1
-rwxr-xr-xio_scene_gltf2/blender/exp/gltf2_blender_utils.py1
33 files changed, 0 insertions, 37 deletions
diff --git a/io_scene_gltf2/blender/exp/gltf2_blender_export.py b/io_scene_gltf2/blender/exp/gltf2_blender_export.py
index 94babf78..0e415e7a 100755
--- a/io_scene_gltf2/blender/exp/gltf2_blender_export.py
+++ b/io_scene_gltf2/blender/exp/gltf2_blender_export.py
@@ -147,4 +147,3 @@ def __notify_end(context, elapsed):
print_console('INFO', 'Finished glTF 2.0 export in {} s'.format(elapsed))
context.window_manager.progress_end()
print_newline()
-
diff --git a/io_scene_gltf2/blender/exp/gltf2_blender_export_keys.py b/io_scene_gltf2/blender/exp/gltf2_blender_export_keys.py
index 8813337b..ef11459d 100755
--- a/io_scene_gltf2/blender/exp/gltf2_blender_export_keys.py
+++ b/io_scene_gltf2/blender/exp/gltf2_blender_export_keys.py
@@ -57,4 +57,3 @@ USE_NO_COLOR = 'gltf_use_no_color'
METALLIC_ROUGHNESS_IMAGE = "metallic_roughness_image"
GROUP_INDEX = 'group_index'
-
diff --git a/io_scene_gltf2/blender/exp/gltf2_blender_gather.py b/io_scene_gltf2/blender/exp/gltf2_blender_gather.py
index 7bff64d3..113fdcc6 100755
--- a/io_scene_gltf2/blender/exp/gltf2_blender_gather.py
+++ b/io_scene_gltf2/blender/exp/gltf2_blender_gather.py
@@ -137,4 +137,3 @@ def __gather_extras(blender_object, export_settings):
if export_settings[gltf2_blender_export_keys.EXTRAS]:
return generate_extras(blender_object)
return None
-
diff --git a/io_scene_gltf2/blender/exp/gltf2_blender_gather_accessors.py b/io_scene_gltf2/blender/exp/gltf2_blender_gather_accessors.py
index 7373a060..2fe992bc 100644
--- a/io_scene_gltf2/blender/exp/gltf2_blender_gather_accessors.py
+++ b/io_scene_gltf2/blender/exp/gltf2_blender_gather_accessors.py
@@ -45,4 +45,3 @@ def gather_accessor(buffer_view: gltf2_io_binary_data.BinaryData,
sparse=None,
type=type
)
-
diff --git a/io_scene_gltf2/blender/exp/gltf2_blender_gather_animation_channel_target.py b/io_scene_gltf2/blender/exp/gltf2_blender_gather_animation_channel_target.py
index 0b23ec85..9dfbea34 100755
--- a/io_scene_gltf2/blender/exp/gltf2_blender_gather_animation_channel_target.py
+++ b/io_scene_gltf2/blender/exp/gltf2_blender_gather_animation_channel_target.py
@@ -119,4 +119,3 @@ def __gather_path(channels: typing.Tuple[bpy.types.FCurve],
raise RuntimeError("Cannot export an animation with {} target".format(target))
return path
-
diff --git a/io_scene_gltf2/blender/exp/gltf2_blender_gather_animation_channels.py b/io_scene_gltf2/blender/exp/gltf2_blender_gather_animation_channels.py
index 36b850df..8f515bcb 100755
--- a/io_scene_gltf2/blender/exp/gltf2_blender_gather_animation_channels.py
+++ b/io_scene_gltf2/blender/exp/gltf2_blender_gather_animation_channels.py
@@ -370,4 +370,3 @@ def __gather_armature_object_channel_groups(blender_action: bpy.types.Action, bl
groups += list(p.values())
return map(tuple, groups)
-
diff --git a/io_scene_gltf2/blender/exp/gltf2_blender_gather_animation_sampler_keyframes.py b/io_scene_gltf2/blender/exp/gltf2_blender_gather_animation_sampler_keyframes.py
index bb59b8a9..87aa04ff 100755
--- a/io_scene_gltf2/blender/exp/gltf2_blender_gather_animation_sampler_keyframes.py
+++ b/io_scene_gltf2/blender/exp/gltf2_blender_gather_animation_sampler_keyframes.py
@@ -388,4 +388,3 @@ def needs_baking(blender_object_if_armature: typing.Optional[bpy.types.Object],
return True
return False
-
diff --git a/io_scene_gltf2/blender/exp/gltf2_blender_gather_animation_samplers.py b/io_scene_gltf2/blender/exp/gltf2_blender_gather_animation_samplers.py
index 27750a72..b95b576a 100755
--- a/io_scene_gltf2/blender/exp/gltf2_blender_gather_animation_samplers.py
+++ b/io_scene_gltf2/blender/exp/gltf2_blender_gather_animation_samplers.py
@@ -410,4 +410,3 @@ def __gather_output(channels: typing.Tuple[bpy.types.FCurve],
sparse=None,
type=data_type
)
-
diff --git a/io_scene_gltf2/blender/exp/gltf2_blender_gather_animations.py b/io_scene_gltf2/blender/exp/gltf2_blender_gather_animations.py
index cf106c41..c78c8065 100755
--- a/io_scene_gltf2/blender/exp/gltf2_blender_gather_animations.py
+++ b/io_scene_gltf2/blender/exp/gltf2_blender_gather_animations.py
@@ -245,4 +245,3 @@ def __get_blender_actions(blender_object: bpy.types.Object,
blender_actions.sort(key = lambda a: a.name.lower())
return [(blender_action, blender_tracks[blender_action.name]) for blender_action in blender_actions]
-
diff --git a/io_scene_gltf2/blender/exp/gltf2_blender_gather_cache.py b/io_scene_gltf2/blender/exp/gltf2_blender_gather_cache.py
index 4efd08f3..b41e400f 100755
--- a/io_scene_gltf2/blender/exp/gltf2_blender_gather_cache.py
+++ b/io_scene_gltf2/blender/exp/gltf2_blender_gather_cache.py
@@ -139,4 +139,3 @@ def skdrivervalues(func):
else:
return func.__skdrivervalues[args[0].name][args[1]]
return wrapper_skdrivervalues
-
diff --git a/io_scene_gltf2/blender/exp/gltf2_blender_gather_cameras.py b/io_scene_gltf2/blender/exp/gltf2_blender_gather_cameras.py
index 6075440c..c9926392 100755
--- a/io_scene_gltf2/blender/exp/gltf2_blender_gather_cameras.py
+++ b/io_scene_gltf2/blender/exp/gltf2_blender_gather_cameras.py
@@ -119,4 +119,3 @@ def __gather_type(blender_camera, export_settings):
elif blender_camera.type == 'ORTHO':
return "orthographic"
return None
-
diff --git a/io_scene_gltf2/blender/exp/gltf2_blender_gather_drivers.py b/io_scene_gltf2/blender/exp/gltf2_blender_gather_drivers.py
index a2ab949b..8157bb45 100644
--- a/io_scene_gltf2/blender/exp/gltf2_blender_gather_drivers.py
+++ b/io_scene_gltf2/blender/exp/gltf2_blender_gather_drivers.py
@@ -71,4 +71,3 @@ def get_sk_driver_values(blender_object, frame, fcurves):
sk_values.append(blender_object.data.shape_keys.path_resolve(get_target_object_path(f.data_path)).value)
return tuple(sk_values)
-
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 f6a9ef94..c389ba19 100755
--- a/io_scene_gltf2/blender/exp/gltf2_blender_gather_image.py
+++ b/io_scene_gltf2/blender/exp/gltf2_blender_gather_image.py
@@ -240,4 +240,3 @@ def __get_texname_from_slot(sockets_or_slots, export_settings):
elif isinstance(sockets_or_slots[0], bpy.types.MaterialTextureSlot):
return sockets_or_slots[0].texture.image.name
-
diff --git a/io_scene_gltf2/blender/exp/gltf2_blender_gather_joints.py b/io_scene_gltf2/blender/exp/gltf2_blender_gather_joints.py
index dce70c31..6b693575 100755
--- a/io_scene_gltf2/blender/exp/gltf2_blender_gather_joints.py
+++ b/io_scene_gltf2/blender/exp/gltf2_blender_gather_joints.py
@@ -81,4 +81,3 @@ def gather_joint(blender_bone, export_settings):
translation=translation,
weights=None
)
-
diff --git a/io_scene_gltf2/blender/exp/gltf2_blender_gather_light_spots.py b/io_scene_gltf2/blender/exp/gltf2_blender_gather_light_spots.py
index b2ab3953..b0b31c1b 100644
--- a/io_scene_gltf2/blender/exp/gltf2_blender_gather_light_spots.py
+++ b/io_scene_gltf2/blender/exp/gltf2_blender_gather_light_spots.py
@@ -42,4 +42,3 @@ def __gather_inner_cone_angle(blender_lamp, _) -> Optional[float]:
def __gather_outer_cone_angle(blender_lamp, _) -> Optional[float]:
return blender_lamp.spot_size * 0.5
-
diff --git a/io_scene_gltf2/blender/exp/gltf2_blender_gather_lights.py b/io_scene_gltf2/blender/exp/gltf2_blender_gather_lights.py
index 05284163..572533d7 100644
--- a/io_scene_gltf2/blender/exp/gltf2_blender_gather_lights.py
+++ b/io_scene_gltf2/blender/exp/gltf2_blender_gather_lights.py
@@ -133,4 +133,3 @@ def __get_cycles_emission_node(blender_lamp) -> Optional[bpy.types.ShaderNodeEmi
continue
return result[0].shader_node
return None
-
diff --git a/io_scene_gltf2/blender/exp/gltf2_blender_gather_material_normal_texture_info_class.py b/io_scene_gltf2/blender/exp/gltf2_blender_gather_material_normal_texture_info_class.py
index 4a46814c..b554717b 100755
--- a/io_scene_gltf2/blender/exp/gltf2_blender_gather_material_normal_texture_info_class.py
+++ b/io_scene_gltf2/blender/exp/gltf2_blender_gather_material_normal_texture_info_class.py
@@ -145,4 +145,3 @@ def __get_tex_from_socket(socket):
if result[0].shader_node.image is None:
return None
return result[0]
-
diff --git a/io_scene_gltf2/blender/exp/gltf2_blender_gather_material_occlusion_texture_info_class.py b/io_scene_gltf2/blender/exp/gltf2_blender_gather_material_occlusion_texture_info_class.py
index da603bdf..671a41f4 100755
--- a/io_scene_gltf2/blender/exp/gltf2_blender_gather_material_occlusion_texture_info_class.py
+++ b/io_scene_gltf2/blender/exp/gltf2_blender_gather_material_occlusion_texture_info_class.py
@@ -135,4 +135,3 @@ def __get_tex_from_socket(socket):
if result[0].shader_node.image is None:
return None
return result[0]
-
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 fceb46f1..35028e5b 100755
--- a/io_scene_gltf2/blender/exp/gltf2_blender_gather_materials.py
+++ b/io_scene_gltf2/blender/exp/gltf2_blender_gather_materials.py
@@ -217,4 +217,3 @@ def __has_image_node_from_socket(socket):
if not result:
return False
return True
-
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 3b2c0055..e774bfef 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
@@ -173,4 +173,3 @@ def __has_image_node_from_socket(socket):
if not result:
return False
return True
-
diff --git a/io_scene_gltf2/blender/exp/gltf2_blender_gather_mesh.py b/io_scene_gltf2/blender/exp/gltf2_blender_gather_mesh.py
index 6a381c8f..1e155ffd 100755
--- a/io_scene_gltf2/blender/exp/gltf2_blender_gather_mesh.py
+++ b/io_scene_gltf2/blender/exp/gltf2_blender_gather_mesh.py
@@ -158,4 +158,3 @@ def __gather_weights(blender_mesh: bpy.types.Mesh,
weights.append(blender_shape_key.value)
return weights
-
diff --git a/io_scene_gltf2/blender/exp/gltf2_blender_gather_nodes.py b/io_scene_gltf2/blender/exp/gltf2_blender_gather_nodes.py
index 21b99459..22a5e492 100755
--- a/io_scene_gltf2/blender/exp/gltf2_blender_gather_nodes.py
+++ b/io_scene_gltf2/blender/exp/gltf2_blender_gather_nodes.py
@@ -410,4 +410,3 @@ def __get_correction_node(blender_object, export_settings):
translation=None,
weights=None
)
-
diff --git a/io_scene_gltf2/blender/exp/gltf2_blender_gather_primitive_attributes.py b/io_scene_gltf2/blender/exp/gltf2_blender_gather_primitive_attributes.py
index 87637b91..f5856257 100755
--- a/io_scene_gltf2/blender/exp/gltf2_blender_gather_primitive_attributes.py
+++ b/io_scene_gltf2/blender/exp/gltf2_blender_gather_primitive_attributes.py
@@ -223,4 +223,3 @@ def __gather_skins(blender_primitive, export_settings):
joint_id = 'JOINTS_' + str(bone_set_index)
weight_id = 'WEIGHTS_' + str(bone_set_index)
return attributes
-
diff --git a/io_scene_gltf2/blender/exp/gltf2_blender_gather_primitives.py b/io_scene_gltf2/blender/exp/gltf2_blender_gather_primitives.py
index b146928c..db1115d0 100755
--- a/io_scene_gltf2/blender/exp/gltf2_blender_gather_primitives.py
+++ b/io_scene_gltf2/blender/exp/gltf2_blender_gather_primitives.py
@@ -232,4 +232,3 @@ def __gather_targets(blender_primitive, blender_mesh, modifiers, export_settings
morph_index += 1
return targets
return None
-
diff --git a/io_scene_gltf2/blender/exp/gltf2_blender_gather_sampler.py b/io_scene_gltf2/blender/exp/gltf2_blender_gather_sampler.py
index 80b74e9c..a7d44d71 100755
--- a/io_scene_gltf2/blender/exp/gltf2_blender_gather_sampler.py
+++ b/io_scene_gltf2/blender/exp/gltf2_blender_gather_sampler.py
@@ -100,4 +100,3 @@ def gather_sampler_from_texture_slot(blender_texture: bpy.types.TextureSlot, exp
wrap_s=wrap,
wrap_t=wrap
)
-
diff --git a/io_scene_gltf2/blender/exp/gltf2_blender_gather_skins.py b/io_scene_gltf2/blender/exp/gltf2_blender_gather_skins.py
index 1ee54b89..2513b073 100755
--- a/io_scene_gltf2/blender/exp/gltf2_blender_gather_skins.py
+++ b/io_scene_gltf2/blender/exp/gltf2_blender_gather_skins.py
@@ -189,4 +189,3 @@ def get_bone_tree(blender_dummy, blender_object):
list_ = list(set(bones))
root_ = list(set(root_bones))
return [blender_object.data.bones[b] for b in list_], children, [blender_object.pose.bones[b] for b in root_]
-
diff --git a/io_scene_gltf2/blender/exp/gltf2_blender_gather_texture.py b/io_scene_gltf2/blender/exp/gltf2_blender_gather_texture.py
index b906413f..13292a5a 100755
--- a/io_scene_gltf2/blender/exp/gltf2_blender_gather_texture.py
+++ b/io_scene_gltf2/blender/exp/gltf2_blender_gather_texture.py
@@ -106,4 +106,3 @@ def __get_tex_from_socket(socket):
if not result:
return None
return result[0]
-
diff --git a/io_scene_gltf2/blender/exp/gltf2_blender_gather_texture_info.py b/io_scene_gltf2/blender/exp/gltf2_blender_gather_texture_info.py
index 66b9b4eb..430dbda8 100755
--- a/io_scene_gltf2/blender/exp/gltf2_blender_gather_texture_info.py
+++ b/io_scene_gltf2/blender/exp/gltf2_blender_gather_texture_info.py
@@ -141,4 +141,3 @@ def __get_tex_from_socket(socket):
if result[0].shader_node.image is None:
return None
return result[0]
-
diff --git a/io_scene_gltf2/blender/exp/gltf2_blender_get.py b/io_scene_gltf2/blender/exp/gltf2_blender_get.py
index fd7d4222..3cee76b4 100755
--- a/io_scene_gltf2/blender/exp/gltf2_blender_get.py
+++ b/io_scene_gltf2/blender/exp/gltf2_blender_get.py
@@ -75,10 +75,6 @@ def get_socket_or_texture_slot(blender_material: bpy.types.Material, name: str):
inputs = sum([[input for input in node.inputs if input.name == name] for node in nodes], [])
if inputs:
return inputs[0]
- else:
-
-
- pass
return None
@@ -222,4 +218,3 @@ def get_node(data_path):
return None
return node_name[:(index)]
-
diff --git a/io_scene_gltf2/blender/exp/gltf2_blender_gltf2_exporter.py b/io_scene_gltf2/blender/exp/gltf2_blender_gltf2_exporter.py
index 2c44a018..c94abc5e 100755
--- a/io_scene_gltf2/blender/exp/gltf2_blender_gltf2_exporter.py
+++ b/io_scene_gltf2/blender/exp/gltf2_blender_gltf2_exporter.py
@@ -328,4 +328,3 @@ def _path_to_uri(path):
path = os.path.normpath(path)
path = path.replace(os.sep, '/')
return urllib.parse.quote(path)
-
diff --git a/io_scene_gltf2/blender/exp/gltf2_blender_image.py b/io_scene_gltf2/blender/exp/gltf2_blender_image.py
index 30f913f8..145e1ed9 100644
--- a/io_scene_gltf2/blender/exp/gltf2_blender_image.py
+++ b/io_scene_gltf2/blender/exp/gltf2_blender_image.py
@@ -340,4 +340,3 @@ def _render_temp_scene(
with open(tmpfilename, "rb") as f:
return f.read()
-
diff --git a/io_scene_gltf2/blender/exp/gltf2_blender_search_node_tree.py b/io_scene_gltf2/blender/exp/gltf2_blender_search_node_tree.py
index 6647abec..4edfc918 100755
--- a/io_scene_gltf2/blender/exp/gltf2_blender_search_node_tree.py
+++ b/io_scene_gltf2/blender/exp/gltf2_blender_search_node_tree.py
@@ -99,4 +99,3 @@ def from_socket(start_socket: bpy.types.NodeSocket,
return []
return __search_from_socket(start_socket, shader_node_filter, [])
-
diff --git a/io_scene_gltf2/blender/exp/gltf2_blender_utils.py b/io_scene_gltf2/blender/exp/gltf2_blender_utils.py
index c3e0d6ee..8d5baae7 100755
--- a/io_scene_gltf2/blender/exp/gltf2_blender_utils.py
+++ b/io_scene_gltf2/blender/exp/gltf2_blender_utils.py
@@ -65,4 +65,3 @@ def min_components(l: list, data_type: gltf2_io_constants.DataType) -> list:
for i, c in enumerate(components):
result[i] = min(result[i], c)
return result
-