diff --git a/fast64_internal/sm64/settings/panels.py b/fast64_internal/sm64/settings/panels.py index f09bd9cbf..ad5d864de 100644 --- a/fast64_internal/sm64/settings/panels.py +++ b/fast64_internal/sm64/settings/panels.py @@ -21,6 +21,7 @@ def draw_repo_settings(scene: Scene, layout: UILayout): prop_split(col, sm64_props, "compression_format", "Compression Format") prop_split(col, sm64_props, "refresh_version", "Refresh (Function Map)") + col.prop(sm64_props, "force_extended_ram") class SM64_GeneralSettingsPanel(SM64_Panel): diff --git a/fast64_internal/sm64/settings/properties.py b/fast64_internal/sm64/settings/properties.py index b86d6cdbd..4d5fe3c5a 100644 --- a/fast64_internal/sm64/settings/properties.py +++ b/fast64_internal/sm64/settings/properties.py @@ -66,6 +66,7 @@ class SM64_Properties(PropertyGroup): sm64_repo_settings_tab: bpy.props.BoolProperty(default=True) refresh_version: EnumProperty(items=enum_refresh_versions, name="Refresh", default="Refresh 13") compression_format: EnumProperty(items=enum_compression_formats, name="Compression", default="mio0") + force_extended_ram: BoolProperty(name="Force Extended Ram", default=True) disable_scroll: BoolProperty(name="Disable Scrolling Textures") def is_binary_export(self): @@ -150,6 +151,7 @@ def draw_props(self, layout: UILayout, show_repo_settings: bool = True): if show_repo_settings: prop_split(col, self, "compression_format", "Compression Format") prop_split(col, self, "refresh_version", "Refresh (Function Map)") + col.prop(self, "force_extended_ram") col.separator() diff --git a/fast64_internal/sm64/settings/repo_settings.py b/fast64_internal/sm64/settings/repo_settings.py index 7397d54eb..a70c95ffa 100644 --- a/fast64_internal/sm64/settings/repo_settings.py +++ b/fast64_internal/sm64/settings/repo_settings.py @@ -19,6 +19,7 @@ def save_sm64_repo_settings(scene: Scene): sm64_props = scene.fast64.sm64 data["refresh_version"] = sm64_props.refresh_version data["compression_format"] = sm64_props.compression_format + data["force_extended_ram"] = sm64_props.force_extended_ram return data @@ -37,3 +38,4 @@ def load_sm64_repo_settings(scene: Scene, data: dict[str, Any]): sm64_props = scene.fast64.sm64 sm64_props.refresh_version = data.get("refresh_version", sm64_props.refresh_version) sm64_props.compression_format = data.get("compression_format", sm64_props.compression_format) + sm64_props.force_extended_ram = data.get("force_extended_ram", sm64_props.force_extended_ram) diff --git a/fast64_internal/utility.py b/fast64_internal/utility.py index 329ef5924..9250a730d 100644 --- a/fast64_internal/utility.py +++ b/fast64_internal/utility.py @@ -462,8 +462,8 @@ def saveDataToFile(filepath, data): def applyBasicTweaks(baseDir): - enableExtendedRAM(baseDir) - return + if bpy.context.scene.fast64.sm64.force_extended_ram: + enableExtendedRAM(baseDir) def enableExtendedRAM(baseDir):