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>2021-07-04 18:48:34 +0300
committerJulien Duroure <julien.duroure@gmail.com>2021-07-04 18:48:34 +0300
commit54d8bdf1f15597b9f6e1aaf308b5a0d5df785552 (patch)
treea5f7f0708fda238ba838a5ad27db014eb7dee7b2
parentac6fe2ff7c9b68b8a08e74ac3b8e350a6eb9d24d (diff)
glTF exporter: fix driver export when shapekey as a dot in name
-rwxr-xr-xio_scene_gltf2/__init__.py2
-rwxr-xr-xio_scene_gltf2/blender/exp/gltf2_blender_gather_animation_samplers.py6
2 files changed, 6 insertions, 2 deletions
diff --git a/io_scene_gltf2/__init__.py b/io_scene_gltf2/__init__.py
index 405ff3c9..c09dc7d3 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, 7, 12),
+ "version": (1, 7, 13),
'blender': (2, 91, 0),
'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 57df6306..d555bcb9 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
@@ -332,7 +332,11 @@ def __gather_output(channels: typing.Tuple[bpy.types.FCurve],
else:
object_path = None
- is_armature_animation = bake_bone is not None or (blender_object_if_armature is not None and object_path != "")
+ # If driver_obj is set, this is a shapekey animation
+ if driver_obj is not None:
+ is_armature_animation = False
+ else:
+ is_armature_animation = bake_bone is not None or (blender_object_if_armature is not None and object_path != "")
if is_armature_animation:
if bake_bone is None: