From e832cf59ccb2bbf6a436184f1143ebf53231c5df Mon Sep 17 00:00:00 2001
From: Sharkitty <hayleylalicorne@gmail.com>
Date: Tue, 12 Sep 2023 15:49:33 +0200
Subject: [PATCH] Fix Cannot pickle object error

---
 openpype/hosts/blender/api/plugin.py                       | 5 +----
 openpype/hosts/blender/plugins/create/create_action.py     | 1 -
 openpype/hosts/blender/plugins/create/create_animation.py  | 1 -
 openpype/hosts/blender/plugins/create/create_camera.py     | 1 -
 openpype/hosts/blender/plugins/create/create_layout.py     | 1 -
 openpype/hosts/blender/plugins/create/create_model.py      | 1 -
 openpype/hosts/blender/plugins/create/create_pointcache.py | 1 -
 openpype/hosts/blender/plugins/create/create_review.py     | 1 -
 openpype/hosts/blender/plugins/create/create_rig.py        | 1 -
 9 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/openpype/hosts/blender/api/plugin.py b/openpype/hosts/blender/api/plugin.py
index 060d229eb5..73d8fc0ed5 100644
--- a/openpype/hosts/blender/api/plugin.py
+++ b/openpype/hosts/blender/api/plugin.py
@@ -237,7 +237,6 @@ class BlenderCreator(Creator):
 
         collection["instance_node"] = instance_node = {
             "name": collection.name,
-            "datablock": collection,
         }
 
         instance_data["instance_node"] = instance_node
@@ -267,9 +266,7 @@ class BlenderCreator(Creator):
 
         for instance_data in cached_subsets.get(self.identifier, []):
             # Process only instances that were created by this creator
-            data = {}
-            for key, value in instance_data.items():
-                data[key] = value
+            data = instance_data.to_dict()
             creator_id = data.get('creator_identifier')
 
             if creator_id == self.identifier:
diff --git a/openpype/hosts/blender/plugins/create/create_action.py b/openpype/hosts/blender/plugins/create/create_action.py
index 7404e7e037..d766fce038 100644
--- a/openpype/hosts/blender/plugins/create/create_action.py
+++ b/openpype/hosts/blender/plugins/create/create_action.py
@@ -32,7 +32,6 @@ class CreateAction(openpype.hosts.blender.api.plugin.BlenderCreator):
 
         collection[AVALON_PROPERTY] = instance_node = {
             "name": collection.name,
-            "datablock": collection,
         }
 
         instance_data.update(
diff --git a/openpype/hosts/blender/plugins/create/create_animation.py b/openpype/hosts/blender/plugins/create/create_animation.py
index c2f24250e1..88ae9e5996 100644
--- a/openpype/hosts/blender/plugins/create/create_animation.py
+++ b/openpype/hosts/blender/plugins/create/create_animation.py
@@ -52,7 +52,6 @@ class CreateAnimation(plugin.BlenderCreator):
 
         asset_group[AVALON_PROPERTY] = instance_node = {
             "name": asset_group.name,
-            "datablock": asset_group,
         }
 
         instance_data.update(
diff --git a/openpype/hosts/blender/plugins/create/create_camera.py b/openpype/hosts/blender/plugins/create/create_camera.py
index a83124cbe7..026b5739d6 100644
--- a/openpype/hosts/blender/plugins/create/create_camera.py
+++ b/openpype/hosts/blender/plugins/create/create_camera.py
@@ -50,7 +50,6 @@ class CreateCamera(plugin.BlenderCreator):
 
         asset_group[AVALON_PROPERTY] = instance_node = {
             "name": asset_group.name,
-            "datablock": asset_group,
         }
 
         instance_data.update(
diff --git a/openpype/hosts/blender/plugins/create/create_layout.py b/openpype/hosts/blender/plugins/create/create_layout.py
index 4fb76ef41e..f46ae58a43 100644
--- a/openpype/hosts/blender/plugins/create/create_layout.py
+++ b/openpype/hosts/blender/plugins/create/create_layout.py
@@ -49,7 +49,6 @@ class CreateLayout(plugin.BlenderCreator):
 
         asset_group[AVALON_PROPERTY] = instance_node = {
             "name": asset_group.name,
-            "datablock": asset_group,
         }
 
         instance_data.update(
diff --git a/openpype/hosts/blender/plugins/create/create_model.py b/openpype/hosts/blender/plugins/create/create_model.py
index 45f1d66ad9..069b78626b 100644
--- a/openpype/hosts/blender/plugins/create/create_model.py
+++ b/openpype/hosts/blender/plugins/create/create_model.py
@@ -49,7 +49,6 @@ class CreateModel(plugin.BlenderCreator):
 
         asset_group[AVALON_PROPERTY] = instance_node = {
             "name": asset_group.name,
-            "datablock": asset_group,
         }
 
         instance_data.update(
diff --git a/openpype/hosts/blender/plugins/create/create_pointcache.py b/openpype/hosts/blender/plugins/create/create_pointcache.py
index 7aa3b22466..3054b81ef5 100644
--- a/openpype/hosts/blender/plugins/create/create_pointcache.py
+++ b/openpype/hosts/blender/plugins/create/create_pointcache.py
@@ -32,7 +32,6 @@ class CreatePointcache(plugin.BlenderCreator):
 
         collection[AVALON_PROPERTY] = instance_node = {
             "name": collection.name,
-            "datablock": collection,
         }
 
         instance_data.update(
diff --git a/openpype/hosts/blender/plugins/create/create_review.py b/openpype/hosts/blender/plugins/create/create_review.py
index a6ca5b1b92..10a96c94fd 100644
--- a/openpype/hosts/blender/plugins/create/create_review.py
+++ b/openpype/hosts/blender/plugins/create/create_review.py
@@ -48,7 +48,6 @@ class CreateReview(plugin.BlenderCreator):
 
         asset_group[AVALON_PROPERTY] = instance_node = {
             "name": asset_group.name,
-            "datablock": asset_group,
         }
 
         instance_data.update(
diff --git a/openpype/hosts/blender/plugins/create/create_rig.py b/openpype/hosts/blender/plugins/create/create_rig.py
index f7c99b0b03..8daffe638d 100644
--- a/openpype/hosts/blender/plugins/create/create_rig.py
+++ b/openpype/hosts/blender/plugins/create/create_rig.py
@@ -49,7 +49,6 @@ class CreateRig(plugin.BlenderCreator):
 
         asset_group[AVALON_PROPERTY] = instance_node = {
             "name": asset_group.name,
-            "datablock": asset_group,
         }
 
         instance_data.update(