From 00e2bebd125615bf31b120aaa452773391245a51 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 9 Feb 2024 14:44:30 +0100
Subject: [PATCH] blender can use AYON settings

---
 .../hosts/blender/plugins/publish/extract_playblast.py   | 9 ++++++---
 .../hosts/blender/plugins/publish/extract_thumbnail.py   | 6 ++++--
 client/ayon_core/settings/ayon_settings.py               | 6 ------
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/client/ayon_core/hosts/blender/plugins/publish/extract_playblast.py b/client/ayon_core/hosts/blender/plugins/publish/extract_playblast.py
index 83e6b26fbe..04fc2c5c39 100644
--- a/client/ayon_core/hosts/blender/plugins/publish/extract_playblast.py
+++ b/client/ayon_core/hosts/blender/plugins/publish/extract_playblast.py
@@ -1,9 +1,11 @@
 import os
+import json
+
 import clique
+import pyblish.api
 
 import bpy
 
-import pyblish.api
 from ayon_core.pipeline import publish
 from ayon_core.hosts.blender.api import capture
 from ayon_core.hosts.blender.api.lib import maintained_time
@@ -23,6 +25,8 @@ class ExtractPlayblast(publish.Extractor, publish.OptionalPyblishPluginMixin):
     optional = True
     order = pyblish.api.ExtractorOrder + 0.01
 
+    presets = "{}"
+
     def process(self, instance):
         if not self.is_active(instance.data):
             return
@@ -59,8 +63,7 @@ class ExtractPlayblast(publish.Extractor, publish.OptionalPyblishPluginMixin):
 
         self.log.debug(f"Outputting images to {path}")
 
-        project_settings = instance.context.data["project_settings"]["blender"]
-        presets = project_settings["publish"]["ExtractPlayblast"]["presets"]
+        presets = json.loads(self.presets)
         preset = presets.get("default")
         preset.update({
             "camera": camera,
diff --git a/client/ayon_core/hosts/blender/plugins/publish/extract_thumbnail.py b/client/ayon_core/hosts/blender/plugins/publish/extract_thumbnail.py
index 7b445a0113..ec701610ce 100644
--- a/client/ayon_core/hosts/blender/plugins/publish/extract_thumbnail.py
+++ b/client/ayon_core/hosts/blender/plugins/publish/extract_thumbnail.py
@@ -1,5 +1,6 @@
 import os
 import glob
+import json
 
 import pyblish.api
 from ayon_core.pipeline import publish
@@ -21,7 +22,7 @@ class ExtractThumbnail(publish.Extractor):
     hosts = ["blender"]
     families = ["review"]
     order = pyblish.api.ExtractorOrder + 0.01
-    presets = {}
+    presets = "{}"
 
     def process(self, instance):
         self.log.debug("Extracting capture..")
@@ -44,7 +45,8 @@ class ExtractThumbnail(publish.Extractor):
         family = instance.data.get("family")
         isolate = instance.data("isolate", None)
 
-        preset = self.presets.get(family, {})
+        presets = json.loads(self.presets)
+        preset = presets.get(family, {})
 
         preset.update({
             "camera": camera,
diff --git a/client/ayon_core/settings/ayon_settings.py b/client/ayon_core/settings/ayon_settings.py
index e151043afb..e2e569c233 100644
--- a/client/ayon_core/settings/ayon_settings.py
+++ b/client/ayon_core/settings/ayon_settings.py
@@ -248,12 +248,6 @@ def _convert_blender_project_settings(ayon_settings, output):
     ayon_blender = ayon_settings["blender"]
     _convert_host_imageio(ayon_blender)
 
-    ayon_publish = ayon_blender["publish"]
-
-    for plugin in ("ExtractThumbnail", "ExtractPlayblast"):
-        plugin_settings = ayon_publish[plugin]
-        plugin_settings["presets"] = json.loads(plugin_settings["presets"])
-
     output["blender"] = ayon_blender