[Bf-extensions-cvs] [354d26d7] master: glTF exporter: Remove no more used filter on layers

Julien Duroure noreply at git.blender.org
Tue May 28 22:51:38 CEST 2019


Commit: 354d26d7515f11bf4119aaf4fba11a9289fbc6e8
Author: Julien Duroure
Date:   Tue May 28 18:00:27 2019 +0200
Branches: master
https://developer.blender.org/rBA354d26d7515f11bf4119aaf4fba11a9289fbc6e8

glTF exporter: Remove no more used filter on layers

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

M	io_scene_gltf2/__init__.py
M	io_scene_gltf2/blender/exp/gltf2_blender_export_keys.py
M	io_scene_gltf2/blender/exp/gltf2_blender_gather_nodes.py

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

diff --git a/io_scene_gltf2/__init__.py b/io_scene_gltf2/__init__.py
index f29c36bc..4c70e0eb 100755
--- a/io_scene_gltf2/__init__.py
+++ b/io_scene_gltf2/__init__.py
@@ -205,12 +205,6 @@ class ExportGLTF2_Base:
         default=False
     )
 
-    # export_layers: BoolProperty(
-    #     name='All layers',
-    #     description='Export all layers, rather than just the first',
-    #     default=True
-    # )
-
     export_extras: BoolProperty(
         name='Custom Properties',
         description='Export custom properties as glTF extras',
diff --git a/io_scene_gltf2/blender/exp/gltf2_blender_export_keys.py b/io_scene_gltf2/blender/exp/gltf2_blender_export_keys.py
index 59443934..a8daa6b4 100755
--- a/io_scene_gltf2/blender/exp/gltf2_blender_export_keys.py
+++ b/io_scene_gltf2/blender/exp/gltf2_blender_export_keys.py
@@ -25,7 +25,6 @@ FILTERED_OBJECTS = 'filtered_objects'
 FILTERED_CAMERAS = 'filtered_cameras'
 
 APPLY = 'gltf_apply'
-LAYERS = 'gltf_layers'
 SELECTED = 'gltf_selected'
 SKINS = 'gltf_skins'
 DISPLACEMENT = 'gltf_displacement'
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 2900c0db..4af4f043 100755
--- a/io_scene_gltf2/blender/exp/gltf2_blender_gather_nodes.py
+++ b/io_scene_gltf2/blender/exp/gltf2_blender_gather_nodes.py
@@ -71,10 +71,6 @@ def __filter_node(blender_object, export_settings):
         return False
     if export_settings[gltf2_blender_export_keys.SELECTED] and blender_object.select_get() is False:
         return False
-    if not export_settings[gltf2_blender_export_keys.LAYERS] and not blender_object.layers[0]:
-        return False
-    if blender_object.instance_collection is not None and not blender_object.instance_collection.layers[0]:
-        return False
 
     return True



More information about the Bf-extensions-cvs mailing list