From 7362631fa435bd5e4db8a8e3f70d0bb3f63619c4 Mon Sep 17 00:00:00 2001 From: Thomas Barlow Date: Wed, 6 Sep 2023 22:44:02 +0100 Subject: [PATCH] FBX IO: Fix error importing transformation animations with a single channel The second return value of _combine_curve_keyframe_times is supposed to be a list of arrays, but when there was only a single input array, that array was being returned directly, without putting it in a list. This fixes an unreported mistake in abab1c9343. --- io_scene_fbx/__init__.py | 2 +- io_scene_fbx/import_fbx.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/io_scene_fbx/__init__.py b/io_scene_fbx/__init__.py index 96860673..3139adcb 100644 --- a/io_scene_fbx/__init__.py +++ b/io_scene_fbx/__init__.py @@ -5,7 +5,7 @@ bl_info = { "name": "FBX format", "author": "Campbell Barton, Bastien Montagne, Jens Restemeier, @Mysteryem", - "version": (5, 7, 0), + "version": (5, 7, 1), "blender": (3, 6, 0), "location": "File > Import-Export", "description": "FBX IO meshes, UVs, vertex colors, materials, textures, cameras, lamps and actions", diff --git a/io_scene_fbx/import_fbx.py b/io_scene_fbx/import_fbx.py index 7d18ef49..c3ff3191 100644 --- a/io_scene_fbx/import_fbx.py +++ b/io_scene_fbx/import_fbx.py @@ -668,7 +668,8 @@ def _combine_curve_keyframe_times(times_and_values_tuples, initial_values): interpolating the keyframe values is a TODO.""" if len(times_and_values_tuples) == 1: # Nothing to do when there is only a single curve. - return times_and_values_tuples[0] + times, values = times_and_values_tuples[0] + return times, [values] all_times = [t[0] for t in times_and_values_tuples]