[Bf-extensions-cvs] [09d1500f] gltf_vtree: glTF exporter: fix merge issue

[Julien Duroure]

Commit: 09d1500f2013f36c3be4b42e2569486e45e649f7
Author: Julien Duroure
Date:   Mon Feb 28 06:30:36 2022 +0100
Branches: gltf_vtree
https://developer.blender.org/rBA09d1500f2013f36c3be4b42e2569486e45e649f7

glTF exporter: fix merge issue

===================================================================

M	io_scene_gltf2/blender/exp/gltf2_blender_gather_animation_sampler_keyframes.py

===================================================================

diff --git a/io_scene_gltf2/blender/exp/gltf2_blender_gather_animation_sampler_keyframes.py b/io_scene_gltf2/blender/exp/gltf2_blender_gather_animation_sampler_keyframes.py
index a12bbedd..711c17c8 100755
--- a/io_scene_gltf2/blender/exp/gltf2_blender_gather_animation_sampler_keyframes.py
+++ b/io_scene_gltf2/blender/exp/gltf2_blender_gather_animation_sampler_keyframes.py
@@ -429,7 +429,7 @@ def gather_keyframes(blender_obj_uuid: str,
             keyframes.append(key)
 
     if not export_settings[gltf2_blender_export_keys.OPTIMIZE_ANIMS]:
-        return keyframes
+        return (keyframes, baking_is_needed)
 
     # For armature only
     # Check if all values are the same