Merge pull request HarbourMasters#50 from Jameriquiah/material-fix

fix material exporter

Author: PurpleHato

fast64_internal/f3d/f3d_bleed.py

@@ -75,11 +75,6 @@ def get_geo_cmds(
     set_modes, clear_modes = set(set_modes), set(clear_modes)
     if len(clear_modes) == 0 and len(set_modes) == 0:
         return ([], [])
-    if is_ex2:
-        if matWriteMethod == GfxMatWriteMethod.WriteAll:
-            return ([SPLoadGeometryMode(set_modes)], [])
-        elif len(set_modes) > 0 and len(clear_modes) > 0:
-            return ([SPGeometryMode(clear_modes, set_modes)], [SPGeometryMode(set_modes, clear_modes)])
     material, revert = [], []
     if len(set_modes) > 0:
         material.append(SPSetGeometryMode(set_modes))

fast64_internal/f3d/f3d_writer.py

@@ -1317,7 +1317,7 @@ def saveOrGetF3DMaterial(material, fModel, _obj, drawLayer, convertTextureData):
     useDict = all_combiner_uses(f3dMat)
 
     defaults = create_or_get_world(bpy.context.scene).rdp_defaults
-    saveGeoModeDefinition(fMaterial, f3dMat.rdp_settings, defaults, fModel.matWriteMethod, fModel.f3d.F3DEX_GBI_2)
+    fMaterial.mat_only_DL.commands.append(DPPipeSync())
 
     # Checking for f3dMat.rdp_settings.g_lighting here will prevent accidental exports,
     # There may be some edge case where this isn't desired.
@@ -1331,8 +1331,6 @@ def saveOrGetF3DMaterial(material, fModel, _obj, drawLayer, convertTextureData):
             fLights = saveLightsDefinition(fModel, fMaterial, f3dMat, materialName + "_lights")
             fMaterial.mat_only_DL.commands.extend([SPSetLights(fLights)])
 
-    fMaterial.mat_only_DL.commands.append(DPPipeSync())
-
     if fMaterial.revert is not None:
         fMaterial.revert.commands.append(DPPipeSync())
 

fast64_internal/hm64/mm/mm_f3d_writer.py

@@ -1323,7 +1323,7 @@ def saveOrGetF3DMaterial(material, fModel, obj, drawLayer, convertTextureData):
     useDict = all_combiner_uses(f3dMat)
 
     defaults = create_or_get_world(bpy.context.scene).rdp_defaults
-    saveGeoModeDefinition(fMaterial, f3dMat.rdp_settings, defaults, fModel.matWriteMethod, fModel.f3d.F3DEX_GBI_2)
+    fMaterial.mat_only_DL.commands.append(DPPipeSync())
 
     # Checking for f3dMat.rdp_settings.g_lighting here will prevent accidental exports,
     # There may be some edge case where this isn't desired.
@@ -1337,7 +1337,6 @@ def saveOrGetF3DMaterial(material, fModel, obj, drawLayer, convertTextureData):
             fLights = saveLightsDefinition(fModel, fMaterial, f3dMat, materialName + "_lights")
             fMaterial.mat_only_DL.commands.extend([SPSetLights(fLights)])
 
-    fMaterial.mat_only_DL.commands.append(DPPipeSync())
     fMaterial.revert.commands.append(DPPipeSync())
 
     fMaterial.getScrollData(material, getMaterialScrollDimensions(f3dMat))
@@ -1386,6 +1385,8 @@ def saveOrGetF3DMaterial(material, fModel, obj, drawLayer, convertTextureData):
                 )
             )
 
+    saveGeoModeDefinition(fMaterial, f3dMat.rdp_settings, defaults, fModel.matWriteMethod, fModel.f3d.F3DEX_GBI_2)
+
     if f3dMat.set_ao:
         fMaterial.mat_only_DL.commands.append(
             SPAmbOcclusion(