diff options
author | Julien Duroure <julien.duroure@gmail.com> | 2020-04-18 10:14:25 +0300 |
---|---|---|
committer | Julien Duroure <julien.duroure@gmail.com> | 2020-04-18 10:14:25 +0300 |
commit | f94f46dac80c4ed603c2cd480f54f09c100c3a36 (patch) | |
tree | e893a27797a0f26c2d9fc3384d902a24f6fa9d3b | |
parent | 91902978790f7e298c0921636cb6d714f56768d6 (diff) | |
parent | 18a0f95a848247fce2143903b520f4433ecd7163 (diff) |
Merge branch 'blender-v2.83-release'
-rwxr-xr-x | io_scene_gltf2/__init__.py | 2 | ||||
-rwxr-xr-x | io_scene_gltf2/blender/exp/gltf2_blender_gather_animation_samplers.py | 18 | ||||
-rw-r--r-- | object_collection_manager/__init__.py | 4 |
3 files changed, 14 insertions, 10 deletions
diff --git a/io_scene_gltf2/__init__.py b/io_scene_gltf2/__init__.py index 504f5afe..edff5a32 100755 --- a/io_scene_gltf2/__init__.py +++ b/io_scene_gltf2/__init__.py @@ -15,7 +15,7 @@ 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, 3, 1), + "version": (1, 3, 2), 'blender': (2, 83, 9), 'location': 'File > Import-Export', 'description': 'Import-Export as glTF 2.0', 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 b95b576a..f2375bb1 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 @@ -271,19 +271,19 @@ def __gather_interpolation(channels: typing.Tuple[bpy.types.FCurve], # If only single keyframe revert to STEP if max_keyframes < 2: return 'STEP' - else: - blender_keyframe = [c for c in channels if c is not None][0].keyframe_points[0] - # For sampled animations: CONSTANT are STEP, other are LINEAR - return { - "BEZIER": "LINEAR", - "LINEAR": "LINEAR", - "CONSTANT": "STEP" - }[blender_keyframe.interpolation] + # If all keyframes are CONSTANT, we can use STEP. + if all(all(k.interpolation == 'CONSTANT' for k in c.keyframe_points) for c in channels if c is not None): + return 'STEP' + + # Otherwise, sampled keyframes use LINEAR interpolation. + return 'LINEAR' + # Non-sampled keyframes implies that all keys are of the same type, and that the + # type is supported by glTF (because we checked in needs_baking). blender_keyframe = [c for c in channels if c is not None][0].keyframe_points[0] - # Select the interpolation method. Any unsupported method will fallback to STEP + # Select the interpolation method. return { "BEZIER": "CUBICSPLINE", "LINEAR": "LINEAR", diff --git a/object_collection_manager/__init__.py b/object_collection_manager/__init__.py index f386c36e..b4807ad7 100644 --- a/object_collection_manager/__init__.py +++ b/object_collection_manager/__init__.py @@ -23,6 +23,10 @@ bl_info = { "description": "Manage collections and their objects", "author": "Ryan Inch", "version": (2,7,11), +<<<<<<< HEAD +======= + "blender": (2, 80, 0), +>>>>>>> blender-v2.83-release "location": "View3D - Object Mode (Shortcut - M)", "warning": '', # used for warning icon and text in addons panel "doc_url": "{BLENDER_MANUAL_URL}/addons/interface/collection_manager.html", |