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:
authorBastien Montagne <montagne29@wanadoo.fr>2016-02-10 22:00:44 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2016-02-10 22:00:44 +0300
commit3c5d5fb1cad25d75df3a3a032e86a58957311fd2 (patch)
tree7065899ee9e1a75d79b9558607827009874f212d /io_anim_nuke_chan/import_nuke_chan.py
parent039f3646b5a2a3a76fd43df1a2cf68bc0242f1c7 (diff)
parent6266b4139503bb614576f15ea4e90870ac5e597d (diff)
Merge branch 'master' into fbx_io_export_ignore_parentsfbx_io_export_ignore_parents
Conflicts: io_scene_fbx/import_fbx.py
Diffstat (limited to 'io_anim_nuke_chan/import_nuke_chan.py')
-rw-r--r--io_anim_nuke_chan/import_nuke_chan.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/io_anim_nuke_chan/import_nuke_chan.py b/io_anim_nuke_chan/import_nuke_chan.py
index ed8528ab..48766e43 100644
--- a/io_anim_nuke_chan/import_nuke_chan.py
+++ b/io_anim_nuke_chan/import_nuke_chan.py
@@ -93,7 +93,7 @@ def read_chan(context, filepath, z_up, rot_ord, sensor_width, sensor_height):
obj.keyframe_insert("rotation_quaternion")
elif obj.rotation_mode == 'AXIS_ANGLE':
tmp_rot = trns[1].to_axis_angle()
- obj.rotation_axis_angle = (tmp_rot[1], ) + tmp_rot[0][:]
+ obj.rotation_axis_angle = (tmp_rot[1], *tmp_rot[0])
obj.keyframe_insert("rotation_axis_angle")
del tmp_rot
else: