From 36888ea6c2dd9359ea17089fc9cfb7094d69138b Mon Sep 17 00:00:00 2001
From: Mervin <63094424+mervinvb@users.noreply.github.com>
Date: Thu, 18 Apr 2024 14:23:52 +0200
Subject: [PATCH 1/2] Made Mari publish match Substance

Had to make some changes to the Mari engine, so now we have a fork of it here!
---
 env/includes/engine_locations.yml           | 7 ++++---
 env/includes/settings/tk-multi-publish2.yml | 2 +-
 env/includes/software_paths.yml             | 6 +++---
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/env/includes/engine_locations.yml b/env/includes/engine_locations.yml
index de04b38b5..f695f848e 100644
--- a/env/includes/engine_locations.yml
+++ b/env/includes/engine_locations.yml
@@ -63,9 +63,10 @@ engines.tk-houdini.location:
 
 # Mari
 engines.tk-mari.location:
-  type: app_store
-  name: tk-mari
-  version: v1.3.4
+  type: github_release
+  organization: nfa-vfxim
+  repository: tk-mari
+  version: v1.4.1
 
 # Maya
 engines.tk-maya.location:
diff --git a/env/includes/settings/tk-multi-publish2.yml b/env/includes/settings/tk-multi-publish2.yml
index 3675d9b83..9f8ae4d82 100644
--- a/env/includes/settings/tk-multi-publish2.yml
+++ b/env/includes/settings/tk-multi-publish2.yml
@@ -160,7 +160,7 @@ settings.tk-multi-publish2.mari.asset_step:
     - name: Publish to ShotGrid
       hook: "{self}/publish_file.py:{engine}/tk-multi-publish2/basic/publish_mari_textures.py"
       settings:
-        Publish Template: asset_mari_texture_tif
+        Publish Template: substancepainter_asset_textures_path_publish
     - name: Upload for review
       hook: "{self}/upload_version.py"
       settings: {}
diff --git a/env/includes/software_paths.yml b/env/includes/software_paths.yml
index b3074b4f0..89665fd91 100644
--- a/env/includes/software_paths.yml
+++ b/env/includes/software_paths.yml
@@ -15,9 +15,9 @@
 ################################################################################
 
 # Mari
-path.linux.mari: "Mari4.6"
-path.mac.mari: "/Applications/Mari4.6v4/Mari4.6v4.app"
-path.windows.mari: C:\Program Files\Mari4.6v4\Bundle\bin\Mari4.6v4.exe
+path.linux.mari: "Mari7.0v2"
+path.mac.mari: "/Applications/Mari7.0v2/Mari7.0v24.app"
+path.windows.mari: "C:/Program Files/Mari7.0v2/Bundle/bin/Mari7.0v2.exe"
 
 # Motionbuilder
 path.windows.motionbuilder: C:\Program Files\Autodesk\MotionBuilder 2022\bin\x64\motionbuilder.exe

From f9c16e2c1445e9613f1b9854b33eb3b6a3891c95 Mon Sep 17 00:00:00 2001
From: Mervin <63094424+mervinvb@users.noreply.github.com>
Date: Thu, 18 Apr 2024 15:50:18 +0200
Subject: [PATCH 2/2] Added USD references to Maya

---
 env/includes/app_locations.yml             | 2 +-
 env/includes/settings/tk-multi-loader2.yml | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/env/includes/app_locations.yml b/env/includes/app_locations.yml
index 8ce70a5a4..80e38299e 100644
--- a/env/includes/app_locations.yml
+++ b/env/includes/app_locations.yml
@@ -68,7 +68,7 @@ apps.tk-multi-loader2.location:
   type: github_release
   organization: nfa-vfxim
   repository: tk-multi-loader2
-  version: 1.21.0.10
+  version: 1.21.0.11
 
 # publish2
 apps.tk-multi-publish2.location:
diff --git a/env/includes/settings/tk-multi-loader2.yml b/env/includes/settings/tk-multi-loader2.yml
index ae686b088..ec8ba4c1e 100644
--- a/env/includes/settings/tk-multi-loader2.yml
+++ b/env/includes/settings/tk-multi-loader2.yml
@@ -123,6 +123,7 @@ settings.tk-multi-loader2.mari:
 settings.tk-multi-loader2.maya:
   action_mappings:
     Alembic Cache: [reference, import]
+    USD: [reference]
     Image: [texture_node, image_plane]
     Maya Scene: [reference, import]
     Photoshop Image: [texture_node, image_plane]