Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix #2394 #2397

Open
wants to merge 2 commits into
base: blender-v4.3-release
Choose a base branch
from
Open

Fix #2394 #2397

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8050085
Fix #2394
julienduroure Nov 5, 2024
ae379fd
fix typo in comment
julienduroure Nov 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions addons/io_scene_gltf2/blender/exp/tree.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -517,14 +517,20 @@ def recursive_get_all_bones(uuid):
else:
return self.nodes[uuid].all_bones

def get_root_bones_uuid(self, uuid): # For armature only
def get_root_bones_uuid(self, uuid, cache=True): # For armature only
if not hasattr(self.nodes[uuid], "root_bones_uuid"):
if self.nodes[uuid].blender_type == VExportNode.ARMATURE:
all_armature_children = self.nodes[uuid].children
self.nodes[uuid].root_bones_uuid = [
root_bones_uuid = [
c for c in all_armature_children if self.nodes[c].blender_type == VExportNode.BONE]
# Not really needed to return, we are just baking it before export really starts
return self.nodes[uuid].root_bones_uuid
if self.export_settings['gltf_def_bones'] is True:
root_bones_uuid = [
c for c in root_bones_uuid if self.nodes[c].use_deform is True]
if cache:
self.nodes[uuid].root_bones_uuid = root_bones_uuid
# in case of caching (first call), we return the value even if not needed
# (because we call the function only to cache the value)
return root_bones_uuid
else:
self.nodes[uuid].root_bones_uuid = []
return []
Expand Down Expand Up @@ -920,7 +926,8 @@ def check_if_we_can_remove_armature(self):
# If is impossible to remove it if armature has multiple root bones. (glTF validator error)
# Currently, we manage it at export level, not at each armature level
for arma_uuid in [n for n in self.nodes.keys() if self.nodes[n].blender_type == VExportNode.ARMATURE]:
if len(self.get_root_bones_uuid(arma_uuid)) > 1:
# Do not cache bones here, as we will filter them later, so the cache will be wrong
if len(self.get_root_bones_uuid(arma_uuid, cache=False)) > 1:
# We can't remove armature
self.export_settings['gltf_armature_object_remove'] = False
self.export_settings['log'].warning(
Expand Down
Loading