Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender-addons.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Duroure <julien.duroure@gmail.com>2019-08-04 18:51:45 +0300
committerJulien Duroure <julien.duroure@gmail.com>2019-08-04 18:51:45 +0300
commitade13102347c9323e1aa55cd5dc554b9f3ab46b0 (patch)
treee5513c9f1c65950c624b8ecaa3f97bb037b22f1b /io_scene_gltf2
parent2bbc4c726425696cf86104d111f7250c8ca7b17c (diff)
glTF exporter: export object from linked library
Diffstat (limited to 'io_scene_gltf2')
-rwxr-xr-xio_scene_gltf2/__init__.py2
-rwxr-xr-xio_scene_gltf2/blender/exp/gltf2_blender_gather_nodes.py7
2 files changed, 7 insertions, 2 deletions
diff --git a/io_scene_gltf2/__init__.py b/io_scene_gltf2/__init__.py
index 844897fa..89de2079 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, Norbert Nopper, Urs Hanselmann, Moritz Becher, Benjamin Schmithüsen, Jim Eckerlein, and many external contributors',
- "version": (0, 9, 41),
+ "version": (0, 9, 42),
'blender': (2, 80, 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 7780a9b2..c13af707 100755
--- a/io_scene_gltf2/blender/exp/gltf2_blender_gather_nodes.py
+++ b/io_scene_gltf2/blender/exp/gltf2_blender_gather_nodes.py
@@ -91,7 +91,12 @@ def __filter_node(blender_object, blender_scene, export_settings):
if blender_scene is not None:
instanced = any([blender_object.name in layer.objects for layer in blender_scene.view_layers])
if instanced is False:
- return False
+ # Check if object is from a linked collection
+ if any([blender_object.name in coll.objects for coll in bpy.data.collections if coll.library is not None]):
+ pass
+ else:
+ # Not instanced, not linked -> We don't keep this object
+ return False
if export_settings[gltf2_blender_export_keys.SELECTED] and blender_object.select_get() is False:
return False