Skip to content

Commit b8af0d3

Browse files
committed
Revert some unneeded changes with respect to upstream
1 parent a4f2888 commit b8af0d3

4 files changed

Lines changed: 4 additions & 5 deletions

File tree

__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@ def register():
453453
bpy.types.Scene.ignoreTextureRestrictions = bpy.props.BoolProperty(name="Ignore Texture Restrictions")
454454
bpy.types.Scene.fullTraceback = bpy.props.BoolProperty(name="Show Full Error Traceback", default=False)
455455
bpy.types.Scene.gameEditorMode = bpy.props.EnumProperty(
456-
name="Game", default="OOT", items=gameEditorEnum, update=gameEditorUpdate
456+
name="Game", default="SM64", items=gameEditorEnum, update=gameEditorUpdate
457457
)
458458
bpy.types.Scene.saveTextures = bpy.props.BoolProperty(name="Save Textures As PNGs (Breaks CI Textures)")
459459
bpy.types.Scene.generateF3DNodeGraph = bpy.props.BoolProperty(name="Generate F3D Node Graph", default=True)

fast64_internal/f3d/f3d_material.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ def getTmemWordUsage(texFormat, width, height):
320320

321321

322322
def getTmemMax(texFormat):
323-
return 2147483648#4096 if texFormat[:2] != "CI" else 2048
323+
return 4096 if texFormat[:2] != "CI" else 2048
324324

325325

326326
# Necessary for UV half pixel offset (see 13.7.5.3)
@@ -2659,7 +2659,7 @@ def ui_image(
26592659
width = height = 0
26602660

26612661
if canUseLargeTextures:
2662-
availTmem = 2147483648#512
2662+
availTmem = 512
26632663
if textureProp.tex_format[:2] == "CI":
26642664
availTmem /= 2
26652665
useDict = all_combiner_uses(material.f3d_mat)

fast64_internal/oot/oot_f3d_writer.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,6 @@ def ootProcessVertexGroup(
156156
fMaterial, texDimensions = saveOrGetF3DMaterial(material, fModel, meshObj, drawLayerOverride, convertTextureData)
157157

158158
for material_index, faces in groupFaces.items():
159-
matLen = len(meshObj.material_slots)
160159
material = meshObj.material_slots[material_index].material
161160
checkForF3dMaterialInFaces(meshObj, material)
162161
fMaterial, texDimensions = saveOrGetF3DMaterial(

fast64_internal/sm64/sm64_f3d_writer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ def exportTexRectCommon(texProp, name, convertTextureData):
310310
raise PluginError(f"In {name}: texture disabled.")
311311
if ti.isTexCI:
312312
raise PluginError(f"In {name}: CI textures not compatible with exportTexRectCommon (because copy mode).")
313-
if ti.tmemSize > 2147483648:#512:
313+
if ti.tmemSize > 512:
314314
raise PluginError(f"In {name}: texture is too big (> 4 KiB).")
315315
if ti.texFormat != "RGBA16":
316316
raise PluginError(f"In {name}: texture format must be RGBA16 (because copy mode).")

0 commit comments

Comments
 (0)