Skip to content

Commit

Permalink
Don't check bungie material flag for name overrides
Browse files Browse the repository at this point in the history
  • Loading branch information
Steven Garcia committed Feb 29, 2024
1 parent 869b7d6 commit 1b9661c
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 5 deletions.
3 changes: 0 additions & 3 deletions io_scene_halo/file_ass/build_scene.py
Original file line number Diff line number Diff line change
Expand Up @@ -150,9 +150,6 @@ def build_scene(context, filepath, report):

set_ass_material_properties(ass_mat, mat)
mat.ass_jms.name_override = ass_mat.asset_name
if len(mat.ass_jms.name_override) > 0:
mat.ass_jms.is_bm = True

mat.diffuse_color = random_color_gen.next()

for ass_object in ASS.objects:
Expand Down
2 changes: 1 addition & 1 deletion io_scene_halo/global_functions/mesh_processing.py
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ def gather_parameters(name):

def append_material_symbols(material, game_version, is_ass):
material_name = material.name
if material.ass_jms.is_bm and not global_functions.string_empty_check(material.ass_jms.name_override):
if not global_functions.string_empty_check(material.ass_jms.name_override):
material_name = material.ass_jms.name_override

processed_symbol_name = material_name
Expand Down
1 change: 0 additions & 1 deletion io_scene_halo/global_ui/material_ui.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ def draw(self, context):
current_material = context.object.active_material
if current_material is not None:
material_ass_jms = current_material.ass_jms
layout.enabled = material_ass_jms.is_bm
row = layout.row()
row.label(text="Name Override:")
row.prop(material_ass_jms, "name_override", text='')
Expand Down

0 comments on commit 1b9661c

Please sign in to comment.