Skip to content
Snippets Groups Projects
Commit 90732ddd authored by Julien Duroure's avatar Julien Duroure
Browse files

glTF exporter: option to export active collection without nested collections

parent 97bb515d
No related branches found
No related tags found
No related merge requests found
......@@ -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, 4, 20),
"version": (3, 4, 21),
'blender': (3, 3, 0),
'location': 'File > Import-Export',
'description': 'Import-Export as glTF 2.0',
......@@ -313,10 +313,16 @@ class ExportGLTF2_Base:
default=False
)
use_active_collection: BoolProperty(
use_active_collection_with_nested: BoolProperty(
name='Active Collection and nested Collections',
description='Export objects in the active collection and nested collections only',
default=False
)
use_active_collection_without_nested: BoolProperty(
name='Active Collection',
description='Export objects in the active collection only',
default=False
default=False
)
use_active_scene: BoolProperty(
......@@ -506,7 +512,8 @@ class ExportGLTF2_Base:
'use_selection',
'use_visible',
'use_renderable',
'use_active_collection',
'use_active_collection_with_nested',
'use_active_collection_without_nested'
'use_mesh_edges',
'use_mesh_vertices',
'use_active_scene',
......@@ -569,7 +576,8 @@ class ExportGLTF2_Base:
export_settings['gltf_visible'] = self.use_visible
export_settings['gltf_renderable'] = self.use_renderable
export_settings['gltf_active_collection'] = self.use_active_collection
export_settings['gltf_active_collection_with_nested'] = self.use_active_collection_with_nested
export_settings['gltf_active_collection_without_nested'] = self.use_active_collection_without_nested
export_settings['gltf_active_scene'] = self.use_active_scene
export_settings['gltf_selected'] = self.use_selection
......@@ -709,7 +717,8 @@ class GLTF_PT_export_include(bpy.types.Panel):
col.prop(operator, 'use_selection')
col.prop(operator, 'use_visible')
col.prop(operator, 'use_renderable')
col.prop(operator, 'use_active_collection')
col.prop(operator, 'use_active_collection_without_nested')
col.prop(operator, 'use_active_collection_with_nested')
col.prop(operator, 'use_active_scene')
col = layout.column(heading = "Data", align = True)
......
......@@ -17,7 +17,8 @@ APPLY = 'gltf_apply'
SELECTED = 'gltf_selected'
VISIBLE = 'gltf_visible'
RENDERABLE = 'gltf_renderable'
ACTIVE_COLLECTION = 'gltf_active_collection'
ACTIVE_COLLECTION_WITH_NESTED = 'gltf_active_collection_with_nested'
ACTIVE_COLLECTION_WITHOUT_NESTED = 'gltf_active_collection_without_nested'
SKINS = 'gltf_skins'
DEF_BONES_ONLY = 'gltf_def_bones'
FORCE_SAMPLING = 'gltf_force_sampling'
......
......@@ -393,11 +393,16 @@ class VExportTree:
if all([c.hide_render for c in self.nodes[uuid].blender_object.users_collection]):
return False
if self.export_settings[gltf2_blender_export_keys.ACTIVE_COLLECTION]:
if self.export_settings[gltf2_blender_export_keys.ACTIVE_COLLECTION_WITH_NESTED]:
found = any(x == self.nodes[uuid].blender_object for x in bpy.context.collection.all_objects)
if not found:
return False
if self.export_settings[gltf2_blender_export_keys.ACTIVE_COLLECTION_WITHOUT_NESTED]:
found = any(x == self.nodes[uuid].blender_object for x in bpy.context.collection.objects)
if not found:
return False
return True
def search_missing_armature(self):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment