diff options
| author | Julien Duroure <julien.duroure@gmail.com> | 2020-03-20 00:44:06 +0300 |
|---|---|---|
| committer | Julien Duroure <julien.duroure@gmail.com> | 2020-03-20 00:44:06 +0300 |
| commit | 191bcee579b30af4098fb2af701470f8b05b6065 (patch) | |
| tree | 3fe837f79b4c40b79eb9e4381390f6974b3859a4 /io_scene_gltf2/blender/exp/gltf2_blender_gather_mesh.py | |
| parent | dc4c83cffc6b6db19f757db5012050a234f00424 (diff) | |
glTF export: manage collection instances / linked collection / armature proxy
Diffstat (limited to 'io_scene_gltf2/blender/exp/gltf2_blender_gather_mesh.py')
| -rwxr-xr-x | io_scene_gltf2/blender/exp/gltf2_blender_gather_mesh.py | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/io_scene_gltf2/blender/exp/gltf2_blender_gather_mesh.py b/io_scene_gltf2/blender/exp/gltf2_blender_gather_mesh.py index 7194798f..d3f950b2 100755 --- a/io_scene_gltf2/blender/exp/gltf2_blender_gather_mesh.py +++ b/io_scene_gltf2/blender/exp/gltf2_blender_gather_mesh.py @@ -25,6 +25,7 @@ from io_scene_gltf2.io.exp.gltf2_io_user_extensions import export_user_extension @cached def gather_mesh(blender_mesh: bpy.types.Mesh, + library: Optional[str], blender_object: Optional[bpy.types.Object], vertex_groups: Optional[bpy.types.VertexGroups], modifiers: Optional[bpy.types.ObjectModifiers], @@ -32,15 +33,15 @@ def gather_mesh(blender_mesh: bpy.types.Mesh, material_names: Tuple[str], export_settings ) -> Optional[gltf2_io.Mesh]: - if not skip_filter and not __filter_mesh(blender_mesh, vertex_groups, modifiers, export_settings): + if not skip_filter and not __filter_mesh(blender_mesh, library, vertex_groups, modifiers, export_settings): return None mesh = gltf2_io.Mesh( - extensions=__gather_extensions(blender_mesh, vertex_groups, modifiers, export_settings), - extras=__gather_extras(blender_mesh, vertex_groups, modifiers, export_settings), - name=__gather_name(blender_mesh, vertex_groups, modifiers, export_settings), - weights=__gather_weights(blender_mesh, vertex_groups, modifiers, export_settings), - primitives=__gather_primitives(blender_mesh, blender_object, vertex_groups, modifiers, material_names, export_settings), + extensions=__gather_extensions(blender_mesh, library, vertex_groups, modifiers, export_settings), + extras=__gather_extras(blender_mesh, library, vertex_groups, modifiers, export_settings), + name=__gather_name(blender_mesh, library, vertex_groups, modifiers, export_settings), + weights=__gather_weights(blender_mesh, library, vertex_groups, modifiers, export_settings), + primitives=__gather_primitives(blender_mesh, library, blender_object, vertex_groups, modifiers, material_names, export_settings), ) if len(mesh.primitives) == 0: @@ -61,6 +62,7 @@ def gather_mesh(blender_mesh: bpy.types.Mesh, def __filter_mesh(blender_mesh: bpy.types.Mesh, + library: Optional[str], vertex_groups: Optional[bpy.types.VertexGroups], modifiers: Optional[bpy.types.ObjectModifiers], export_settings @@ -72,6 +74,7 @@ def __filter_mesh(blender_mesh: bpy.types.Mesh, def __gather_extensions(blender_mesh: bpy.types.Mesh, + library: Optional[str], vertex_groups: Optional[bpy.types.VertexGroups], modifiers: Optional[bpy.types.ObjectModifiers], export_settings @@ -80,6 +83,7 @@ def __gather_extensions(blender_mesh: bpy.types.Mesh, def __gather_extras(blender_mesh: bpy.types.Mesh, + library: Optional[str], vertex_groups: Optional[bpy.types.VertexGroups], modifiers: Optional[bpy.types.ObjectModifiers], export_settings @@ -107,6 +111,7 @@ def __gather_extras(blender_mesh: bpy.types.Mesh, def __gather_name(blender_mesh: bpy.types.Mesh, + library: Optional[str], vertex_groups: Optional[bpy.types.VertexGroups], modifiers: Optional[bpy.types.ObjectModifiers], export_settings @@ -115,6 +120,7 @@ def __gather_name(blender_mesh: bpy.types.Mesh, def __gather_primitives(blender_mesh: bpy.types.Mesh, + library: Optional[str], blender_object: Optional[bpy.types.Object], vertex_groups: Optional[bpy.types.VertexGroups], modifiers: Optional[bpy.types.ObjectModifiers], @@ -122,6 +128,7 @@ def __gather_primitives(blender_mesh: bpy.types.Mesh, export_settings ) -> List[gltf2_io.MeshPrimitive]: return gltf2_blender_gather_primitives.gather_primitives(blender_mesh, + library, blender_object, vertex_groups, modifiers, @@ -130,6 +137,7 @@ def __gather_primitives(blender_mesh: bpy.types.Mesh, def __gather_weights(blender_mesh: bpy.types.Mesh, + library: Optional[str], vertex_groups: Optional[bpy.types.VertexGroups], modifiers: Optional[bpy.types.ObjectModifiers], export_settings |