[Bf-extensions-cvs] [1e5d8bd5] master: glTF: remove 2.79 on upstream repository
Julien Duroure
noreply at git.blender.org
Fri Feb 21 22:28:27 CET 2020
Commit: 1e5d8bd56d968ae29f7d648b95462aa8c3acecff
Author: Julien Duroure
Date: Fri Feb 21 22:27:26 2020 +0100
Branches: master
https://developer.blender.org/rBA1e5d8bd56d968ae29f7d648b95462aa8c3acecff
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
===================================================================
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_extras.py
M io_scene_gltf2/blender/com/gltf2_blender_json.py
M io_scene_gltf2/blender/com/gltf2_blender_material_helpers.py
M io_scene_gltf2/blender/com/gltf2_blender_math.py
M io_scene_gltf2/blender/exp/gltf2_blender_export.py
M io_scene_gltf2/blender/exp/gltf2_blender_export_keys.py
M io_scene_gltf2/blender/exp/gltf2_blender_gather.py
M io_scene_gltf2/blender/exp/gltf2_blender_gather_accessors.py
M io_scene_gltf2/blender/exp/gltf2_blender_gather_animation_channel_target.py
M io_scene_gltf2/blender/exp/gltf2_blender_gather_animation_channels.py
M io_scene_gltf2/blender/exp/gltf2_blender_gather_animation_sampler_keyframes.py
M io_scene_gltf2/blender/exp/gltf2_blender_gather_animation_samplers.py
M io_scene_gltf2/blender/exp/gltf2_blender_gather_animations.py
M io_scene_gltf2/blender/exp/gltf2_blender_gather_cache.py
M io_scene_gltf2/blender/exp/gltf2_blender_gather_cameras.py
M io_scene_gltf2/blender/exp/gltf2_blender_gather_drivers.py
M io_scene_gltf2/blender/exp/gltf2_blender_gather_image.py
M io_scene_gltf2/blender/exp/gltf2_blender_gather_joints.py
M io_scene_gltf2/blender/exp/gltf2_blender_gather_light_spots.py
M io_scene_gltf2/blender/exp/gltf2_blender_gather_lights.py
M io_scene_gltf2/blender/exp/gltf2_blender_gather_material_normal_texture_info_class.py
M io_scene_gltf2/blender/exp/gltf2_blender_gather_material_occlusion_texture_info_class.py
M io_scene_gltf2/blender/exp/gltf2_blender_gather_materials.py
M io_scene_gltf2/blender/exp/gltf2_blender_gather_materials_pbr_metallic_roughness.py
M io_scene_gltf2/blender/exp/gltf2_blender_gather_mesh.py
M io_scene_gltf2/blender/exp/gltf2_blender_gather_nodes.py
M io_scene_gltf2/blender/exp/gltf2_blender_gather_primitive_attributes.py
M io_scene_gltf2/blender/exp/gltf2_blender_gather_primitives.py
M io_scene_gltf2/blender/exp/gltf2_blender_gather_sampler.py
M io_scene_gltf2/blender/exp/gltf2_blender_gather_skins.py
M io_scene_gltf2/blender/exp/gltf2_blender_gather_texture.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_gltf2_exporter.py
M io_scene_gltf2/blender/exp/gltf2_blender_image.py
M io_scene_gltf2/blender/exp/gltf2_blender_search_node_tree.py
M io_scene_gltf2/blender/exp/gltf2_blender_utils.py
M io_scene_gltf2/blender/imp/gltf2_blender_KHR_materials_pbrSpecularGlossiness.py
M io_scene_gltf2/blender/imp/gltf2_blender_KHR_materials_unlit.py
M io_scene_gltf2/blender/imp/gltf2_blender_animation.py
M io_scene_gltf2/blender/imp/gltf2_blender_animation_bone.py
M io_scene_gltf2/blender/imp/gltf2_blender_animation_node.py
M io_scene_gltf2/blender/imp/gltf2_blender_animation_utils.py
M io_scene_gltf2/blender/imp/gltf2_blender_animation_weight.py
M io_scene_gltf2/blender/imp/gltf2_blender_camera.py
M io_scene_gltf2/blender/imp/gltf2_blender_gltf.py
M io_scene_gltf2/blender/imp/gltf2_blender_image.py
M io_scene_gltf2/blender/imp/gltf2_blender_light.py
M io_scene_gltf2/blender/imp/gltf2_blender_material.py
M io_scene_gltf2/blender/imp/gltf2_blender_mesh.py
M io_scene_gltf2/blender/imp/gltf2_blender_node.py
M io_scene_gltf2/blender/imp/gltf2_blender_pbrMetallicRoughness.py
M io_scene_gltf2/blender/imp/gltf2_blender_primitive.py
M io_scene_gltf2/blender/imp/gltf2_blender_skin.py
M io_scene_gltf2/blender/imp/gltf2_blender_texture.py
M io_scene_gltf2/blender/imp/gltf2_blender_vnode.py
M io_scene_gltf2/io/__init__.py
M io_scene_gltf2/io/com/gltf2_io.py
M io_scene_gltf2/io/com/gltf2_io_color_management.py
M io_scene_gltf2/io/com/gltf2_io_constants.py
M io_scene_gltf2/io/com/gltf2_io_debug.py
M io_scene_gltf2/io/com/gltf2_io_extensions.py
M io_scene_gltf2/io/com/gltf2_io_lights_punctual.py
M io_scene_gltf2/io/exp/gltf2_io_binary_data.py
M io_scene_gltf2/io/exp/gltf2_io_buffer.py
M io_scene_gltf2/io/exp/gltf2_io_draco_compression_extension.py
M io_scene_gltf2/io/exp/gltf2_io_export.py
M io_scene_gltf2/io/exp/gltf2_io_image_data.py
M io_scene_gltf2/io/exp/gltf2_io_user_extensions.py
M io_scene_gltf2/io/imp/__init__.py
M io_scene_gltf2/io/imp/gltf2_io_binary.py
M io_scene_gltf2/io/imp/gltf2_io_gltf.py
===================================================================
diff --git a/io_scene_gltf2/__init__.py b/io_scene_gltf2/__init__.py
index 2ad36029..4bbfbd81 100755
--- a/io_scene_gltf2/__init__.py
+++ b/io_scene_gltf2/__init__.py
@@ -15,8 +15,8 @@
bl_info = {
'name': 'glTF 2.0 format',
'author': 'Julien Duroure, Norbert Nopper, Urs Hanselmann, Moritz Becher, Benjamin Schmithüsen, Jim Eckerlein, and many external contributors',
- "version": (1, 2, 20),
- 'blender': (2, 81, 6),
+ "version": (1, 2, 21),
+ 'blender': (2, 82, 7),
'location': 'File > Import-Export',
'description': 'Import-Export as glTF 2.0',
'warning': '',
@@ -480,13 +480,8 @@ class ExportGLTF2_Base:
return gltf2_blender_export.save(context, export_settings)
-
-
-
-
-
def draw(self, context):
- pass
+ pass # Is needed to get panels available
class GLTF_PT_export_main(bpy.types.Panel):
@@ -947,4 +942,3 @@ def unregister():
# remove from the export / import menu
bpy.types.TOPBAR_MT_file_export.remove(menu_func_export)
bpy.types.TOPBAR_MT_file_import.remove(menu_func_import)
-
diff --git a/io_scene_gltf2/blender/com/gltf2_blender_conversion.py b/io_scene_gltf2/blender/com/gltf2_blender_conversion.py
index fccfce95..574e26e5 100755
--- a/io_scene_gltf2/blender/com/gltf2_blender_conversion.py
+++ b/io_scene_gltf2/blender/com/gltf2_blender_conversion.py
@@ -60,4 +60,3 @@ def get_target(property):
"scale": "scale",
"value": "weights"
}.get(property)
-
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 6ba77709..a4cb6625 100755
--- a/io_scene_gltf2/blender/com/gltf2_blender_data_path.py
+++ b/io_scene_gltf2/blender/com/gltf2_blender_data_path.py
@@ -36,4 +36,3 @@ def get_rotation_modes(target_property: str) -> str:
return True, ["AXIS_ANGLE"]
else:
return False, []
-
diff --git a/io_scene_gltf2/blender/com/gltf2_blender_extras.py b/io_scene_gltf2/blender/com/gltf2_blender_extras.py
index c67cb903..6cf220e6 100644
--- a/io_scene_gltf2/blender/com/gltf2_blender_extras.py
+++ b/io_scene_gltf2/blender/com/gltf2_blender_extras.py
@@ -91,4 +91,3 @@ def set_extras(blender_element, extras, exclude=[]):
blender_element[custom_property] = value
except TypeError as e:
print('Error setting property %s to value of type %s' % (custom_property, type(value)))
-
diff --git a/io_scene_gltf2/blender/com/gltf2_blender_json.py b/io_scene_gltf2/blender/com/gltf2_blender_json.py
index fbf833c1..e96e58ff 100755
--- a/io_scene_gltf2/blender/com/gltf2_blender_json.py
+++ b/io_scene_gltf2/blender/com/gltf2_blender_json.py
@@ -35,4 +35,3 @@ def is_json_convertible(data):
return True
except:
return False
-
diff --git a/io_scene_gltf2/blender/com/gltf2_blender_material_helpers.py b/io_scene_gltf2/blender/com/gltf2_blender_material_helpers.py
index 2b26350d..349cfda9 100755
--- a/io_scene_gltf2/blender/com/gltf2_blender_material_helpers.py
+++ b/io_scene_gltf2/blender/com/gltf2_blender_material_helpers.py
@@ -15,4 +15,3 @@
def get_gltf_node_name():
return "glTF Settings"
-
diff --git a/io_scene_gltf2/blender/com/gltf2_blender_math.py b/io_scene_gltf2/blender/com/gltf2_blender_math.py
index 9c65b943..fb342bc4 100755
--- a/io_scene_gltf2/blender/com/gltf2_blender_math.py
+++ b/io_scene_gltf2/blender/com/gltf2_blender_math.py
@@ -170,4 +170,3 @@ def transform_value(value: Vector, _: Matrix = Matrix.Identity(4)) -> Vector:
def round_if_near(value: float, target: float) -> float:
"""If value is very close to target, round to target."""
return value if abs(value - target) > 2.0e-6 else target
-
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/
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-extensions-cvs
mailing list