Skip to content

Commit

Permalink
Merge branch 'blender-v4.3-release'
Browse files Browse the repository at this point in the history
  • Loading branch information
@julienduroure
julienduroure committed Oct 31, 2024
2 parents 9591744 + 2a194b2 commit e189740
Show file tree
Hide file tree
Showing 2 changed files with 52 additions and 52 deletions.
2 changes: 1 addition & 1 deletion addons/io_scene_gltf2/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
bl_info = {
'name': 'glTF 2.0 format',
'author': 'Julien Duroure, Scurest, Norbert Nopper, Urs Hanselmann, Moritz Becher, Benjamin Schmithüsen, Jim Eckerlein, and many external contributors',
"version": (4, 4, 7),
"version": (4, 4, 8),
'blender': (4, 3, 0),
'location': 'File > Import-Export',
'description': 'Import-Export as glTF 2.0',
Expand Down
102 changes: 51 additions & 51 deletions addons/io_scene_gltf2/blender/exp/animation/scene_animation.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,67 +158,67 @@ def gather_scene_animations(export_settings):

total_channels = []

# Export now KHR_animation_pointer for lights
for light in export_settings['KHR_animation_pointer']['lights'].keys():
if len(export_settings['KHR_animation_pointer']['lights'][light]['paths']) == 0:
continue

blender_light = [l for l in bpy.data.lights if id(l) == light][0]

export_settings['ranges'][id(blender_light)] = {}
export_settings['ranges'][id(blender_light)][id(blender_light)] = {'start': start_frame, 'end': end_frame}

if export_settings['gltf_anim_slide_to_zero'] is True and start_frame > 0:
add_slide_data(start_frame, light, light, export_settings, add_drivers=False)
# Export now KHR_animation_pointer for lights
for light in export_settings['KHR_animation_pointer']['lights'].keys():
if len(export_settings['KHR_animation_pointer']['lights'][light]['paths']) == 0:
continue

channels = gather_data_sampled_channels('lights', light, light, None, export_settings)
if channels is not None:
total_channels.extend(channels)
blender_light = [l for l in bpy.data.lights if id(l) == light][0]

if export_settings['gltf_anim_scene_split_object'] is True:
if len(total_channels) > 0:
animation = gltf2_io.Animation(
channels=total_channels,
extensions=None,
extras=__gather_extras(blender_light, export_settings),
name=blender_light.name,
samplers=[]
)
link_samplers(animation, export_settings)
animations.append(animation)
export_settings['ranges'][id(blender_light)] = {}
export_settings['ranges'][id(blender_light)][id(blender_light)] = {'start': start_frame, 'end': end_frame}

total_channels = []
if export_settings['gltf_anim_slide_to_zero'] is True and start_frame > 0:
add_slide_data(start_frame, light, light, export_settings, add_drivers=False)

# Export now KHR_animation_pointer for cameras
for cam in export_settings['KHR_animation_pointer']['cameras'].keys():
if len(export_settings['KHR_animation_pointer']['cameras'][cam]['paths']) == 0:
continue
channels = gather_data_sampled_channels('lights', light, light, None, export_settings)
if channels is not None:
total_channels.extend(channels)

blender_camera = [l for l in bpy.data.cameras if id(l) == cam][0]
if export_settings['gltf_anim_scene_split_object'] is True:
if len(total_channels) > 0:
animation = gltf2_io.Animation(
channels=total_channels,
extensions=None,
extras=__gather_extras(blender_light, export_settings),
name=blender_light.name,
samplers=[]
)
link_samplers(animation, export_settings)
animations.append(animation)

total_channels = []

# Export now KHR_animation_pointer for cameras
for cam in export_settings['KHR_animation_pointer']['cameras'].keys():
if len(export_settings['KHR_animation_pointer']['cameras'][cam]['paths']) == 0:
continue

export_settings['ranges'][id(blender_camera)] = {}
export_settings['ranges'][id(blender_camera)][id(blender_camera)] = {'start': start_frame, 'end': end_frame}
blender_camera = [l for l in bpy.data.cameras if id(l) == cam][0]

if export_settings['gltf_anim_slide_to_zero'] is True and start_frame > 0:
add_slide_data(start_frame, cam, cam, export_settings, add_drivers=False)
export_settings['ranges'][id(blender_camera)] = {}
export_settings['ranges'][id(blender_camera)][id(blender_camera)] = {'start': start_frame, 'end': end_frame}

channels = gather_data_sampled_channels('cameras', cam, cam, None, export_settings)
if channels is not None:
total_channels.extend(channels)
if export_settings['gltf_anim_slide_to_zero'] is True and start_frame > 0:
add_slide_data(start_frame, cam, cam, export_settings, add_drivers=False)

if export_settings['gltf_anim_scene_split_object'] is True:
if len(total_channels) > 0:
animation = gltf2_io.Animation(
channels=total_channels,
extensions=None,
extras=__gather_extras(blender_camera, export_settings),
name=blender_camera.name,
samplers=[]
)
link_samplers(animation, export_settings)
animations.append(animation)
channels = gather_data_sampled_channels('cameras', cam, cam, None, export_settings)
if channels is not None:
total_channels.extend(channels)

total_channels = []
if export_settings['gltf_anim_scene_split_object'] is True:
if len(total_channels) > 0:
animation = gltf2_io.Animation(
channels=total_channels,
extensions=None,
extras=__gather_extras(blender_camera, export_settings),
name=blender_camera.name,
samplers=[]
)
link_samplers(animation, export_settings)
animations.append(animation)

total_channels = []

if export_settings['gltf_anim_scene_split_object'] is False:
if len(total_channels) > 0:
Expand Down

0 comments on commit e189740

Please sign in to comment.