[Bf-extensions-cvs] [849e7196] master: glTF exporter: Fix T99306 : Fix camera & light export when Yup is off

[Julien Duroure]

Commit: 849e7196eb4ee7bc5ca8a5644da49ffbd3ff3c97
Author: Julien Duroure
Date:   Fri Jul 1 06:30:32 2022 +0200
Branches: master
https://developer.blender.org/rBA849e7196eb4ee7bc5ca8a5644da49ffbd3ff3c97

glTF exporter: Fix T99306 : Fix camera & light export when Yup is off

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

M	io_scene_gltf2/__init__.py
M	io_scene_gltf2/blender/exp/gltf2_blender_gather_tree.py

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

diff --git a/io_scene_gltf2/__init__.py b/io_scene_gltf2/__init__.py
index 5fb93dba..39763f8d 100755
--- a/io_scene_gltf2/__init__.py
+++ b/io_scene_gltf2/__init__.py
@@ -4,7 +4,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": (3, 3, 10),
+    "version": (3, 3, 11),
     'blender': (3, 3, 0),
     'location': 'File > Import-Export',
     'description': 'Import-Export as glTF 2.0',
diff --git a/io_scene_gltf2/blender/exp/gltf2_blender_gather_tree.py b/io_scene_gltf2/blender/exp/gltf2_blender_gather_tree.py
index ba63e049..0377a6b7 100644
--- a/io_scene_gltf2/blender/exp/gltf2_blender_gather_tree.py
+++ b/io_scene_gltf2/blender/exp/gltf2_blender_gather_tree.py
@@ -163,10 +163,16 @@ class VExportTree:
             # So real world matrix is collection world_matrix @ "world_matrix" of object
             node.matrix_world = parent_coll_matrix_world @ blender_object.matrix_world.copy()
             if node.blender_type == VExportNode.CAMERA and self.export_settings[gltf2_blender_export_keys.CAMERAS]:
-                correction = Quaternion((2**0.5/2, -2**0.5/2, 0.0, 0.0))
+                if self.export_settings[gltf2_blender_export_keys.YUP]:
+                    correction = Quaternion((2**0.5/2, -2**0.5/2, 0.0, 0.0))
+                else:
+                    correction = Matrix.Identity(4).to_quaternion()
                 node.matrix_world @= correction.to_matrix().to_4x4()
             elif node.blender_type == VExportNode.LIGHT and self.export_settings[gltf2_blender_export_keys.LIGHTS]:
-                correction = Quaternion((2**0.5/2, -2**0.5/2, 0.0, 0.0))
+                if self.export_settings[gltf2_blender_export_keys.YUP]:
+                    correction = Quaternion((2**0.5/2, -2**0.5/2, 0.0, 0.0))
+                else:
+                    correction = Matrix.Identity(4).to_quaternion()
                 node.matrix_world @= correction.to_matrix().to_4x4()
         elif node.blender_type == VExportNode.BONE:
             if self.export_settings['gltf_current_frame'] is True: