From a3efb07742d16443510feee667cf1aa3b8bcd4a9 Mon Sep 17 00:00:00 2001
From: empathicqubit <empathicqubit@entan.gl>
Date: Tue, 1 Jun 2021 05:34:03 -0400
Subject: [PATCH] Fix model texture dependency

---
 Makefile                         |  10 ++++----
 export_gimp_textures.py          |  40 ++++++++++---------------------
 plugin/Data/_EQ_ItemRoulette.esp | Bin 858 -> 864 bytes
 3 files changed, 19 insertions(+), 31 deletions(-)

diff --git a/Makefile b/Makefile
index 76250d0..5488897 100644
--- a/Makefile
+++ b/Makefile
@@ -36,13 +36,15 @@ plugin/Data/Scripts/%.pex: Source/Scripts/%.psc
 			"$^" \
 			"-f=$(SKYRIM_BASE)/Data/Source/Scripts/TESV_Papyrus_Flags.flg" \
 			"-i=$(SKYRIM_BASE)/Data/Source/Scripts;Source/Scripts" \
-			"-o=$@" \
+			"-o=$@"
 
 textures: $(textureFiles)
-		GIMP=$$(powershell -Command '(Get-Item "$(ProgramW6432)/GIMP*/bin/gimp-console*.exe").FullName')
-		"$$GIMP" -n -i --batch-interpreter python-fu-eval -b "import export_gimp_textures"
 
-models: $(modelFiles)
+plugin/Data/Textures/_EQ_ItemRoulette/%.dds: Source/Textures/_EQ_ItemRoulette/%.xcf
+		GIMP=$$(powershell -Command '(Get-Item "$(ProgramW6432)/GIMP*/bin/gimp-console*.exe").FullName')
+		"$$GIMP" -n -i --batch-interpreter python-fu-eval -b 'import export_gimp_textures ; export_gimp_textures.main("$<", "$@")'
+
+models: $(modelFiles) textures
 
 build/ChunkMerge/ChunkMerge.exe: build/chunkmerge.7z
 		7z x -y "-obuild" "$<"
diff --git a/export_gimp_textures.py b/export_gimp_textures.py
index 9f6ca80..d2495e2 100644
--- a/export_gimp_textures.py
+++ b/export_gimp_textures.py
@@ -1,30 +1,16 @@
-from gimpfu import pdb
-import platform
-import sys
+def main(xcf_path, dds_path):
+    from gimpfu import pdb
+    import platform
+    import sys
 
-pdb.gimp_message("Started exporting textures.")
-pdb.gimp_message(platform.python_version())
+    pdb.gimp_message("Started exporting textures.")
+    pdb.gimp_message(platform.python_version())
 
-try:
-    import glob
-    import os
-    import pydoc
+    try:
+        import os
+        import pydoc
 
-    curdir = os.path.dirname(os.path.abspath(__file__))
-    pdb.gimp_message("Current directory: " + curdir)
-    plugin_data_dir = os.path.join(curdir, "plugin/Data")
-    pdb.gimp_message("Plugin directory: " + plugin_data_dir)
-    texture_src_dir = os.path.join(curdir, "Source/Textures/_EQ_ItemRoulette")
-    pdb.gimp_message("Texture Source directory: " + texture_src_dir)
-    texture_dest_dir = os.path.join(plugin_data_dir, "Textures/_EQ_ItemRoulette")
-    pdb.gimp_message("Texture Dest directory: " + texture_dest_dir)
-
-    # FIXME This won't recurse
-    xcf_paths = glob.glob(texture_src_dir + "/*.xcf")
-    for xcf_path in xcf_paths:
-        dest_xcf_path = os.path.join(texture_dest_dir, os.path.relpath(path=xcf_path, start=texture_src_dir))
-        dds_parent = os.path.dirname(dest_xcf_path)
-        dds_path = os.path.join(os.path.splitext(dest_xcf_path)[0] + '.dds')
+        dds_parent = os.path.dirname(dds_path)
         pdb.gimp_message(xcf_path + " -> " + dds_path)
         try:
             os.makedirs(dds_parent)
@@ -69,7 +55,7 @@ try:
             # (3, 'alpha-test-threshold', 'Alpha test threshold value for which alpha test converage should be preserved')
         )
         pdb.gimp_image_delete(image)
-except:
-    pdb.gimp_message("An unhandled error occurred: " + str(sys.exc_info()[0]) + ": " + str(sys.exc_info()[1]))
+    except:
+        pdb.gimp_message("An unhandled error occurred: " + str(sys.exc_info()[0]) + ": " + str(sys.exc_info()[1]))
 
-pdb.gimp_quit(0)
\ No newline at end of file
+    pdb.gimp_quit(0)
\ No newline at end of file
diff --git a/plugin/Data/_EQ_ItemRoulette.esp b/plugin/Data/_EQ_ItemRoulette.esp
index b4fc053ee1761c2609fa96697218ebedf9d49a28..821f3d4236e1231efdc3b1fdedd5841513ba1a73 100644
GIT binary patch
delta 124
zcmcb`_JD1I8q;szi5fAIyBHW4f<qibfE2?)Ef5LecTJq@$*4E+xe8l+T4r8i&SY*z
zOG%IdMxX-spwNJ=K$;zhnSl7<<XA>=#)Fef8C$?=fI?t3kwC?Pp}`QtHw!U&FaiL#
C2ORhS

delta 116
zcmaFBc8hI-8q+L~i5fAITNoG^f<qibfE2?%Ef5Lew@jSt$*3{$xyocgMoUAG3?op+
pJt#C_E0AUfVkRI)7M}~`Gehyd$<>T4jQb`ri8JooEWzZ#2mlpV7_k5V