mirror of
https://github.com/blender/blender
synced 2026-09-29 04:37:17 +03:00
Merge branch 'blender-v5.1-release'
This commit is contained in:
commit
80af1dbc21
3 changed files with 9 additions and 2 deletions
|
|
@ -1 +1 @@
|
|||
Subproject commit 4823633a900ec280dfa89bfa4a63a1585b1219df
|
||||
Subproject commit 70f181411c1ff25e44fc45efe222959eb17e5948
|
||||
|
|
@ -7,7 +7,7 @@ bl_info = {
|
|||
# This is now displayed as the maintainer, so show the foundation.
|
||||
# "author": "Julien Duroure, Scurest, Norbert Nopper, Urs Hanselmann, Moritz Becher, Benjamin Schmithüsen, Jim Eckerlein", # Original Authors
|
||||
'author': "Blender Foundation, Khronos Group",
|
||||
"version": (5, 2, 1),
|
||||
"version": (5, 2, 2),
|
||||
'blender': (4, 4, 0),
|
||||
'location': 'File > Import-Export',
|
||||
'description': 'Import-Export as glTF 2.0',
|
||||
|
|
|
|||
|
|
@ -856,6 +856,13 @@ def __get_blender_actions(obj_uuid: str,
|
|||
id(item.action) for item in bpy.data.scenes[0].gltf_action_filter if item.keep is False]:
|
||||
continue # We ignore this action
|
||||
|
||||
# Check that a slot is assigned to the strip
|
||||
if strip.action_slot is None:
|
||||
export_settings['log'].warning(
|
||||
"Strip '{}' on track '{}' has no action slot assigned, and will be ignored.".format(
|
||||
strip.name, track.name))
|
||||
continue
|
||||
|
||||
# Store Action info
|
||||
new_action = ActionData(strip.action)
|
||||
new_action.add_slot(strip.action_slot, strip.action_slot.target_id_type, track.name)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue