diff options
| author | Julien Duroure <julien.duroure@gmail.com> | 2019-06-14 00:48:57 +0300 |
|---|---|---|
| committer | Julien Duroure <julien.duroure@gmail.com> | 2019-06-14 00:48:57 +0300 |
| commit | a30fce5376c5a70cb64cff58298b8a392512ef2d (patch) | |
| tree | 19e896b7e8d4395e334855b267af463a1d2c3980 /io_scene_gltf2/blender/exp/gltf2_blender_gather_primitives.py | |
| parent | 4579db103294ac8b6b81549c6b9cfc91b37e5847 (diff) | |
glTF exporter: fix regression about exporting with applied modifiers, cache enhancement
Diffstat (limited to 'io_scene_gltf2/blender/exp/gltf2_blender_gather_primitives.py')
| -rwxr-xr-x | io_scene_gltf2/blender/exp/gltf2_blender_gather_primitives.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/io_scene_gltf2/blender/exp/gltf2_blender_gather_primitives.py b/io_scene_gltf2/blender/exp/gltf2_blender_gather_primitives.py index 403ca5eb..2c4ee91f 100755 --- a/io_scene_gltf2/blender/exp/gltf2_blender_gather_primitives.py +++ b/io_scene_gltf2/blender/exp/gltf2_blender_gather_primitives.py @@ -32,7 +32,7 @@ from io_scene_gltf2.io.com.gltf2_io_debug import print_console @cached def gather_primitives( - blender_mesh_name: str, + blender_mesh: bpy.types.Mesh, vertex_groups: Optional[bpy.types.VertexGroups], modifiers: Optional[bpy.types.ObjectModifiers], material_names: Tuple[str], @@ -45,7 +45,7 @@ def gather_primitives( """ primitives = [] - blender_primitives = __gather_cache_primitives(blender_mesh_name, + blender_primitives = __gather_cache_primitives(blender_mesh, vertex_groups, modifiers, export_settings) for internal_primitive in blender_primitives: @@ -78,7 +78,7 @@ def gather_primitives( @cached def __gather_cache_primitives( - blender_mesh_name: str, + blender_mesh: bpy.types.Mesh, vertex_groups: Optional[bpy.types.VertexGroups], modifiers: Optional[bpy.types.ObjectModifiers], export_settings @@ -86,7 +86,6 @@ def __gather_cache_primitives( """ Gather parts that are identical for instances, i.e. excluding materials """ - blender_mesh = bpy.data.meshes[blender_mesh_name] primitives = [] blender_primitives = gltf2_blender_extract.extract_primitives( |