glTF export: Do not export empty node when camera or light export is disable

2 files changed, 7 insertions, 1 deletions

diff --git a/io_scene_gltf2/__init__.py b/io_scene_gltf2/__init__.py
index 325b6fc3..ab7aebb4 100755
--- a/io_scene_gltf2/__init__.py
+++ b/io_scene_gltf2/__init__.py
@@ -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": (1, 7, 18),
+    "version": (1, 7, 19),
     'blender': (2, 91, 0),
     'location': 'File > Import-Export',
     'description': 'Import-Export as glTF 2.0',
diff --git a/io_scene_gltf2/blender/exp/gltf2_blender_gather_nodes.py b/io_scene_gltf2/blender/exp/gltf2_blender_gather_nodes.py
index 7b58c0f9..a2fc57be 100755
--- a/io_scene_gltf2/blender/exp/gltf2_blender_gather_nodes.py
+++ b/io_scene_gltf2/blender/exp/gltf2_blender_gather_nodes.py
@@ -140,6 +140,12 @@ def __filter_node(blender_object, blender_scene, export_settings):
         if not found:
             return False
 
+    if blender_object.type == 'LIGHT':
+        return export_settings[gltf2_blender_export_keys.LIGHTS]
+
+    if blender_object.type == 'CAMERA':
+        return export_settings[gltf2_blender_export_keys.CAMERAS]
+
     return True