falso
/
mm
mirror of https://github.com/zeldaret/mm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

git subrepo pull (merge) --force tools/ZAPD (#618) 

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "0ba781304"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "0ba781304"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"
This commit is contained in:
EllipticEllipsis 2022-01-17 01:05:00 +00:00 committed by GitHub
parent aa90d1ee2b
commit 0da2ed135b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/ZAPD/.gitrepo
View File

@ -6,7 +6,7 @@
[subrepo] [subrepo]
remote = https://github.com/zeldaret/ZAPD.git remote = https://github.com/zeldaret/ZAPD.git
branch = master branch = master
commit = bf16ff7c4c409358a53793b72260b1d8e474cf0c commit = 0ba78130478ee1272bc0e2f2fec2d162e7f7f995
parent = a7cc87394ed4afb5ebe1f2318526545b6bbe205d parent = aa90d1ee2be577fb8a18c1c3c6dcafda2e732190
method = merge method = merge
cmdver = 0.4.3 cmdver = 0.4.3

2
tools/ZAPD/ZAPD/ZTexture.cpp
View File

@ -722,7 +722,7 @@ void ZTexture::Save(const fs::path& outFolder)
if (!Directory::Exists(outPath.string())) if (!Directory::Exists(outPath.string()))
Directory::CreateDirectory(outPath.string()); Directory::CreateDirectory(outPath.string());
std::filesystem::__cxx11::path outFileName; fs::path outFileName;
if (!dWordAligned) if (!dWordAligned)
outFileName = outPath / (outName + ".u32" + "." + GetExternalExtension() + ".png"); outFileName = outPath / (outName + ".u32" + "." + GetExternalExtension() + ".png");