blender/blender-addons
19
43
Fork 96
Code Issues 631 Pull Requests 27 Projects 1 Releases Wiki Activity

Fix #104875: Animated dupli instances export frozen in place #104876

Merged
Thomas Barlow merged 4 commits from Mysteryem/blender-addons:fbx_export_anim_instances_104875 into main 2023-09-11 17:29:15 +02:00
Conversation 1 Commits 4 Files Changed 2 +14 -3
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
io_scene_fbx/__init__.py
View File

@ -5,7 +5,7 @@
bl_info = { bl_info = {
"name": "FBX format", "name": "FBX format",
"author": "Campbell Barton, Bastien Montagne, Jens Restemeier, @Mysteryem", "author": "Campbell Barton, Bastien Montagne, Jens Restemeier, @Mysteryem",
"version": (5, 7, 3), "version": (5, 7, 4),
"blender": (3, 6, 0), "blender": (3, 6, 0),
"location": "File > Import-Export", "location": "File > Import-Export",
"description": "FBX IO meshes, UVs, vertex colors, materials, textures, cameras, lamps and actions", "description": "FBX IO meshes, UVs, vertex colors, materials, textures, cameras, lamps and actions",

15
io_scene_fbx/export_fbx_bin.py
View File

@ -2249,13 +2249,24 @@ def fbx_animations_do(scene_data, ref_id, f_start, f_end, start_zero, objects=No
force_sek, (cam.dof.focus_distance,)) force_sek, (cam.dof.focus_distance,))
animdata_cameras[cam_key] = (acnode_lens, acnode_focus_distance, cam) animdata_cameras[cam_key] = (acnode_lens, acnode_focus_distance, cam)
# Get all parent bdata of animated dupli instances, so that we can quickly identify which instances in
# `depsgraph.object_instances` are animated and need their ObjectWrappers' matrices updated each frame.
dupli_parent_bdata = {dup.get_parent().bdata for dup in animdata_ob if dup.is_dupli}
has_animated_duplis = bool(dupli_parent_bdata)
currframe = f_start currframe = f_start
while currframe <= f_end: while currframe <= f_end:
real_currframe = currframe - f_start if start_zero else currframe real_currframe = currframe - f_start if start_zero else currframe
scene.frame_set(int(currframe), subframe=currframe - int(currframe)) scene.frame_set(int(currframe), subframe=currframe - int(currframe))
for dp_obj in ob_obj.dupli_list_gen(depsgraph): if has_animated_duplis:
pass # Merely updating dupli matrix of ObjectWrapper... # Changing the scene's frame invalidates existing dupli instances. To get the updated matrices of duplis for
# this frame, we must get the duplis from the depsgraph again.
for dup in depsgraph.object_instances:
if (parent := dup.parent) and parent.original in dupli_parent_bdata:
# ObjectWrapper caches its instances. Attempting to create a new instance updates the existing
# ObjectWrapper instance with the current frame's matrix and then returns the existing instance.
ObjectWrapper(dup)
for ob_obj, (anim_loc, anim_rot, anim_scale) in animdata_ob.items(): for ob_obj, (anim_loc, anim_rot, anim_scale) in animdata_ob.items():
# We compute baked loc/rot/scale for all objects (rot being euler-compat with previous value!). # We compute baked loc/rot/scale for all objects (rot being euler-compat with previous value!).
p_rot = p_rots.get(ob_obj, None) p_rot = p_rots.get(ob_obj, None)