Skip to content

GPU instances nodes removal fixes #2577

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

Open
2frac wants to merge 2 commits into
base: main
Choose a base branch
from
+50 −50
Open

GPU instances nodes removal fixes #2577

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c8226ec
delete all removed nodes instead of last scene's
2frac Jun 24, 2025
a47d0c6
rework instanced nodes deletion
2frac Jun 24, 2025
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
100 changes: 50 additions & 50 deletions addons/io_scene_gltf2/blender/exp/exporter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,70 +278,73 @@ def manage_gpu_instancing(self, node, also_mesh=False):
self.__traverse(holder.extensions)

# Remove children from original Empty
new_children = []
for child_idx in node.children:
if child_idx not in insts:
new_children.append(child_idx)
node.children = new_children
insts_set = set(insts)
node.children = [child_idx for child_idx in node.children if child_idx not in insts_set]

self.nodes_idx_to_remove.extend(insts)

for child_idx in node.children:
child = self.__gltf.nodes[child_idx]
self.manage_gpu_instancing(child, also_mesh=child.mesh is not None)
child = self.__gltf.nodes[child_idx]
self.manage_gpu_instancing(child, also_mesh=child.mesh is not None)

def manage_gpu_instancing_nodes(self, export_settings):
if export_settings['gltf_gpu_instances'] is True:
for scene_num in range(len(self.__gltf.scenes)):

self.nodes_idx_to_remove = []
for scene in self.__gltf.scenes:
# Modify the scene data in case of EXT_mesh_gpu_instancing export

self.nodes_idx_to_remove = []
for node_idx in self.__gltf.scenes[scene_num].nodes:
for node_idx in scene.nodes:
node = self.__gltf.nodes[node_idx]
if node.mesh is None:
self.manage_gpu_instancing(node)
else:
self.manage_gpu_instancing(node, also_mesh=True)

# Slides other nodes index

if self.nodes_idx_to_remove:
self.nodes_idx_to_remove.sort()
for node_idx in self.__gltf.scenes[scene_num].nodes:
self.recursive_slide_node_idx(node_idx)
to_remove = set(self.nodes_idx_to_remove)

old_to_new = {}
node_count = 0
for node_idx in range(len(self.__gltf.nodes)):
if node_idx in to_remove:
continue
old_to_new[node_idx] = node_count
node_count += 1

new_node_list = []
for node_idx in self.__gltf.scenes[scene_num].nodes:
len_ = len([i for i in self.nodes_idx_to_remove if i < node_idx])
new_node_list.append(node_idx - len_)
self.__gltf.scenes[scene_num].nodes = new_node_list
for scene in self.__gltf.scenes:
# Slides other nodes index
for node_idx in scene.nodes:
self.recursive_slide_node_idx(node_idx, old_to_new)

scene.nodes = [old_to_new[node_idx] for node_idx in scene.nodes]

for skin in self.__gltf.skins:
new_joint_list = []
for node_idx in skin.joints:
len_ = len([i for i in self.nodes_idx_to_remove if i < node_idx])
new_joint_list.append(node_idx - len_)
skin.joints = new_joint_list
skin.joints = [old_to_new[node_idx] for node_idx in skin.joints]

if skin.skeleton is not None:
len_ = len([i for i in self.nodes_idx_to_remove if i < skin.skeleton])
skin.skeleton = skin.skeleton - len_

# Remove animation channels that was targeting a node that will be removed
new_animation_list = []
for animation in self.__gltf.animations:
new_channel_list = []
for channel in animation.channels:
if channel.target.node not in self.nodes_idx_to_remove:
new_channel_list.append(channel)
animation.channels = new_channel_list
if len(animation.channels) > 0:
new_animation_list.append(animation)
self.__gltf.animations = new_animation_list

# TODO: remove unused animation accessors?

# And now really remove nodes
self.__gltf.nodes = [node for idx, node in enumerate(
self.__gltf.nodes) if idx not in self.nodes_idx_to_remove]
skin.skeleton = old_to_new[skin.skeleton]

# Remove animation channels that was targeting a node that will be removed
new_animation_list = []
for animation in self.__gltf.animations:
new_channel_list = []
for channel in animation.channels:
if channel.target.node in old_to_new:
channel.target.node = old_to_new[channel.target.node]
new_channel_list.append(channel)
animation.channels = new_channel_list
if len(animation.channels) > 0:
new_animation_list.append(animation)
self.__gltf.animations = new_animation_list

# TODO: remove unused animation accessors?

to_remove = set(self.nodes_idx_to_remove)
# # And now really remove nodes
self.__gltf.nodes = [node for idx, node in enumerate(
self.__gltf.nodes) if idx not in to_remove]

def add_scene(self, scene: gltf2_io.Scene, active: bool = False, export_settings=None):
"""
Expand All @@ -359,16 +362,13 @@ def add_scene(self, scene: gltf2_io.Scene, active: bool = False, export_settings
if active:
self.__gltf.scene = scene_num

def recursive_slide_node_idx(self, node_idx):
def recursive_slide_node_idx(self, node_idx: int, old_to_new: dict):
node = self.__gltf.nodes[node_idx]

new_node_children = []
for child_idx in node.children:
len_ = len([i for i in self.nodes_idx_to_remove if i < child_idx])
new_node_children.append(child_idx - len_)
new_node_children = [old_to_new[node_idx] for node_idx in node.children]

for child_idx in node.children:
self.recursive_slide_node_idx(child_idx)
self.recursive_slide_node_idx(child_idx, old_to_new)

node.children = new_node_children

Expand Down