Skip to content

Commit d7051f6

Browse files
committed
Fix material gathering for physics objects
1 parent ca9fb8b commit d7051f6

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

io_scene_halo/file_jms/process_scene.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ def process_scene(context, version, game_version, generate_checksum, fix_rotatio
280280
if not variant_name in region_list:
281281
region_list.append(variant_name)
282282

283-
material_index = global_functions.get_material(original_geo.material_slots, evaluted_mesh, face, variant_name, material_list)
283+
material_index = global_functions.get_material(spheres.material_slots, mesh_sphere, face, variant_name, material_list)
284284

285285
parent_index = global_functions.get_parent(blend_scene.armature, spheres, joined_list, -1)
286286
sphere_matrix = global_functions.get_matrix(spheres, spheres, True, blend_scene.armature, joined_list, False, version, 'JMS', False, custom_scale, fix_rotations)
@@ -307,7 +307,7 @@ def process_scene(context, version, game_version, generate_checksum, fix_rotatio
307307
if not variant_name in region_list:
308308
region_list.append(variant_name)
309309

310-
material_index = global_functions.get_material(original_geo.material_slots, evaluted_mesh, face, variant_name, material_list)
310+
material_index = global_functions.get_material(boxes.material_slots, mesh_boxes, face, variant_name, material_list)
311311

312312
parent_index = global_functions.get_parent(blend_scene.armature, boxes, joined_list, -1)
313313
box_matrix = global_functions.get_matrix(boxes, boxes, True, blend_scene.armature, joined_list, False, version, 'JMS', False, custom_scale, fix_rotations)
@@ -336,7 +336,7 @@ def process_scene(context, version, game_version, generate_checksum, fix_rotatio
336336
if not variant_name in region_list:
337337
region_list.append(variant_name)
338338

339-
material_index = global_functions.get_material(original_geo.material_slots, evaluted_mesh, face, variant_name, material_list)
339+
material_index = global_functions.get_material(capsule.material_slots, mesh_capsule, face, variant_name, material_list)
340340

341341
parent_index = global_functions.get_parent(blend_scene.armature, capsule, joined_list, -1)
342342
capsule_matrix = global_functions.get_matrix(capsule, capsule, True, blend_scene.armature, joined_list, False, version, 'JMS', False, custom_scale, fix_rotations)
@@ -367,7 +367,7 @@ def process_scene(context, version, game_version, generate_checksum, fix_rotatio
367367
if not variant_name in region_list:
368368
region_list.append(variant_name)
369369

370-
material_index = global_functions.get_material(original_geo.material_slots, evaluted_mesh, face, variant_name, material_list)
370+
material_index = global_functions.get_material(original_geo.material_slots, evaluated_geo, face, variant_name, material_list)
371371

372372
parent_index = global_functions.get_parent(blend_scene.armature, original_geo, joined_list, -1)
373373
convex_matrix = global_functions.get_matrix(original_geo, original_geo, True, blend_scene.armature, joined_list, False, version, 'JMS', False, custom_scale, fix_rotations)

0 commit comments

Comments
 (0)