diff options
author | Julien Duroure <julien.duroure@gmail.com> | 2021-01-17 11:38:27 +0300 |
---|---|---|
committer | Julien Duroure <julien.duroure@gmail.com> | 2021-01-17 11:38:27 +0300 |
commit | 1715c1e8f528d67ec817290a1ae320070995fd06 (patch) | |
tree | 003044854b5a44a8efe0ff27fc31f1f197f84134 /io_scene_gltf2 | |
parent | 2ac013ce0ba3547da2a8162ca420833b0d30d005 (diff) | |
parent | d7f8d9a4f919894b23ee855d3b1a2327222de468 (diff) |
Merge branch 'blender-v2.92-release'
Diffstat (limited to 'io_scene_gltf2')
-rwxr-xr-x | io_scene_gltf2/__init__.py | 2 | ||||
-rwxr-xr-x | io_scene_gltf2/blender/imp/gltf2_blender_scene.py | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/io_scene_gltf2/__init__.py b/io_scene_gltf2/__init__.py index f8484203..2a32d8a6 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, Scurest, Norbert Nopper, Urs Hanselmann, Moritz Becher, Benjamin Schmithüsen, Jim Eckerlein, and many external contributors', - "version": (1, 6, 0), + "version": (1, 6, 1), 'blender': (2, 91, 0), 'location': 'File > Import-Export', 'description': 'Import-Export as glTF 2.0', diff --git a/io_scene_gltf2/blender/imp/gltf2_blender_scene.py b/io_scene_gltf2/blender/imp/gltf2_blender_scene.py index e6eadcd6..1a276960 100755 --- a/io_scene_gltf2/blender/imp/gltf2_blender_scene.py +++ b/io_scene_gltf2/blender/imp/gltf2_blender_scene.py @@ -50,7 +50,9 @@ class BlenderScene(): def create_animations(gltf): """Create animations.""" if gltf.data.animations: - for anim_idx, _anim in enumerate(gltf.data.animations): + # NLA tracks are added bottom to top, so create animations in + # reverse so the first winds up on top + for anim_idx in reversed(range(len(gltf.data.animations))): BlenderAnimation.anim(gltf, anim_idx) # Restore first animation |