From 5bf6e36ef6d1256d6827eda12c36dbae5423e6a2 Mon Sep 17 00:00:00 2001 From: Julien Duroure Date: Tue, 28 May 2019 17:49:24 +0200 Subject: [PATCH] Remove no more used layer filter --- addons/io_scene_gltf2/__init__.py | 6 ------ .../blender/exp/gltf2_blender_export_keys.py | 1 - .../blender/exp/gltf2_blender_gather_nodes.py | 8 -------- 3 files changed, 15 deletions(-) diff --git a/addons/io_scene_gltf2/__init__.py b/addons/io_scene_gltf2/__init__.py index b7d94a5f1..7398a467c 100644 --- a/addons/io_scene_gltf2/__init__.py +++ b/addons/io_scene_gltf2/__init__.py @@ -205,12 +205,6 @@ def __init__(self): 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/addons/io_scene_gltf2/blender/exp/gltf2_blender_export_keys.py b/addons/io_scene_gltf2/blender/exp/gltf2_blender_export_keys.py index 9df25d760..707ff98a5 100644 --- a/addons/io_scene_gltf2/blender/exp/gltf2_blender_export_keys.py +++ b/addons/io_scene_gltf2/blender/exp/gltf2_blender_export_keys.py @@ -25,7 +25,6 @@ FILTERED_CAMERAS = 'filtered_cameras' APPLY = 'gltf_apply' -LAYERS = 'gltf_layers' SELECTED = 'gltf_selected' SKINS = 'gltf_skins' DISPLACEMENT = 'gltf_displacement' diff --git a/addons/io_scene_gltf2/blender/exp/gltf2_blender_gather_nodes.py b/addons/io_scene_gltf2/blender/exp/gltf2_blender_gather_nodes.py index 3bbb9885b..cdeacdbb1 100644 --- a/addons/io_scene_gltf2/blender/exp/gltf2_blender_gather_nodes.py +++ b/addons/io_scene_gltf2/blender/exp/gltf2_blender_gather_nodes.py @@ -75,14 +75,6 @@ def __filter_node(blender_object, export_settings): else: 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 bpy.app.version < (2, 80, 0): - if blender_object.dupli_group is not None and not blender_object.dupli_group.layers[0]: - return False - else: - if blender_object.instance_collection is not None and not blender_object.instance_collection.layers[0]: - return False return True