diff options
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 | 10 |
1 files changed, 5 insertions, 5 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 576a1418..d7784c3e 100755 --- a/io_scene_gltf2/blender/exp/gltf2_blender_gather_primitives.py +++ b/io_scene_gltf2/blender/exp/gltf2_blender_gather_primitives.py @@ -8,7 +8,7 @@ import numpy as np from .gltf2_blender_export_keys import NORMALS, MORPH_NORMAL, TANGENTS, MORPH_TANGENT, MORPH from io_scene_gltf2.blender.exp.gltf2_blender_gather_cache import cached, cached_by_key -from io_scene_gltf2.blender.exp import gltf2_blender_extract +from io_scene_gltf2.blender.exp import gltf2_blender_gather_primitives_extract from io_scene_gltf2.blender.exp import gltf2_blender_gather_accessors from io_scene_gltf2.blender.exp import gltf2_blender_gather_primitive_attributes from io_scene_gltf2.blender.exp import gltf2_blender_gather_materials @@ -112,7 +112,7 @@ def __gather_cache_primitives( """ primitives = [] - blender_primitives = gltf2_blender_extract.extract_primitives( + blender_primitives = gltf2_blender_gather_primitives_extract.extract_primitives( blender_mesh, uuid_for_skined_data, vertex_groups, modifiers, export_settings) for internal_primitive in blender_primitives: @@ -184,7 +184,7 @@ def __gather_targets(blender_primitive, blender_mesh, modifiers, export_settings if blender_primitive["attributes"].get(target_position_id) is not None: target = {} - internal_target_position = blender_primitive["attributes"][target_position_id] + internal_target_position = blender_primitive["attributes"][target_position_id]["data"] target["POSITION"] = gltf2_blender_gather_primitive_attributes.array_to_accessor( internal_target_position, component_type=gltf2_io_constants.ComponentType.Float, @@ -196,7 +196,7 @@ def __gather_targets(blender_primitive, blender_mesh, modifiers, export_settings and export_settings[MORPH_NORMAL] \ and blender_primitive["attributes"].get(target_normal_id) is not None: - internal_target_normal = blender_primitive["attributes"][target_normal_id] + internal_target_normal = blender_primitive["attributes"][target_normal_id]["data"] target['NORMAL'] = gltf2_blender_gather_primitive_attributes.array_to_accessor( internal_target_normal, component_type=gltf2_io_constants.ComponentType.Float, @@ -206,7 +206,7 @@ def __gather_targets(blender_primitive, blender_mesh, modifiers, export_settings if export_settings[TANGENTS] \ and export_settings[MORPH_TANGENT] \ and blender_primitive["attributes"].get(target_tangent_id) is not None: - internal_target_tangent = blender_primitive["attributes"][target_tangent_id] + internal_target_tangent = blender_primitive["attributes"][target_tangent_id]["data"] target['TANGENT'] = gltf2_blender_gather_primitive_attributes.array_to_accessor( internal_target_tangent, component_type=gltf2_io_constants.ComponentType.Float, |