ApfelTeeSaft/lightspeed64
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/lightspeed64.git synced 2026-08-26 19:33:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed issue where material preset was being unset.

Browse Source
This commit is contained in:
kurethedead
2019-12-21 19:15:49 -08:00
parent 3d62d4dc0c
commit d0919f448c
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fast64_internal/f3d_material.py
+8 -6
View File
@@ -605,8 +605,8 @@ def update_node_values(self, context):
if hasattr(context.scene, 'world') and \
self == context.scene.world.rdp_defaults:
pass
elif hasattr(context, 'material') and context.material is not None:
material = context.material # Handles case of texture property groups
elif hasattr(context, 'material_slot') and context.material_slot is not None:
material = context.material_slot.material # Handles case of texture property groups
if not material.is_f3d or material.f3d_update_flag:
return
material.f3d_update_flag = True
@@ -804,10 +804,11 @@ def update_tex_values_manual(self, context):
'Get UV.001', isTexGen, uvBasisScale1, self.tex_scale)
def update_preset(self, context):
if hasattr(context, 'material') and context.material is not None:
if context.material.f3d_preset != 'Custom':
materialSettings = materialPresetDict[context.material.f3d_preset]
materialSettings.applyToMaterial(context.material)
if hasattr(context, 'material_slot') and context.material_slot is not None:
material = context.material_slot.material
if material.f3d_preset != 'Custom':
materialSettings = materialPresetDict[material.f3d_preset]
materialSettings.applyToMaterial(material)
def update_preset_manual(material, context):
if material.f3d_preset != 'Custom':
@@ -817,6 +818,7 @@ def update_preset_manual(material, context):
def createF3DMat(obj):
material = bpy.data.materials.new('sm64_material')
obj.data.materials.append(material)
bpy.context.object.active_material_index = len(obj.material_slots) - 1
material.is_f3d = True