From 6a2e5d8c722a4333ab0d355a5955afd5fddafbbe Mon Sep 17 00:00:00 2001 From: Mehmet Date: Thu, 2 Jun 2022 02:25:54 +0300 Subject: [PATCH] Revert previous changes that broke a lot of things --- modules/AssetExporter.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/modules/AssetExporter.py b/modules/AssetExporter.py index 6697731..f784fc5 100644 --- a/modules/AssetExporter.py +++ b/modules/AssetExporter.py @@ -964,11 +964,7 @@ def exportMinimap(mapName: str, dir: SourceDir, game="WaW"): image: Image # csgo uses dds images for radars whereas older games use vtf images if dir.copy(f"resource/overviews/{data['material']}_radar.dds", f"{tempDir}/matTex/{mapName}_radar.dds", silent=True): -<<<<<<< Updated upstream Image.open(f"{tempDir}/matTex/{mapName}_radar.dds").save(f"{tempDir}/converted/texture_assets/corvid/{mapName}/{mapName}_radar.{ext}", silent=True) -======= - Image.open(f"{tempDir}/matTex/{mapName}_radar.dds").save(f"{tempDir}/converted/texture_assets/corvid/{mapName}_radar.{ext}", silent=True) ->>>>>>> Stashed changes elif dir.copy(f"materials/{data['material']}_radar.vmt", f"{tempDir}/mat/{mapName}_radar.vmt"): mat = parse_vdf(fixVmt(open(f"{tempDir}/mat/{mapName}_radar.vmt").read())) mat = mat[list(mat)[0]]