From a2a47787db707215d3597e53cf4dc33857a96219 Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Tue, 14 Nov 2023 09:12:09 +0100
Subject: [PATCH] Avoid need for executing in main thread by just not using
 `bpy.ops` functions.

I also skipped the "keep_transform" part of the functionality since it's redundant because the created asset group is always at origin by default, and thus needs no matrix inverse computations.
---
 .../blender/plugins/create/create_camera.py      | 16 +++++-----------
 .../blender/plugins/create/create_layout.py      |  7 ++-----
 .../hosts/blender/plugins/create/create_model.py | 11 +++--------
 .../hosts/blender/plugins/create/create_rig.py   | 10 +++-------
 4 files changed, 13 insertions(+), 31 deletions(-)

diff --git a/openpype/hosts/blender/plugins/create/create_camera.py b/openpype/hosts/blender/plugins/create/create_camera.py
index 13075f718e..b0c0fc28db 100644
--- a/openpype/hosts/blender/plugins/create/create_camera.py
+++ b/openpype/hosts/blender/plugins/create/create_camera.py
@@ -2,7 +2,7 @@
 
 import bpy
 
-from openpype.hosts.blender.api import plugin, lib, ops
+from openpype.hosts.blender.api import plugin, lib
 from openpype.hosts.blender.api.pipeline import AVALON_INSTANCES
 
 
@@ -17,7 +17,6 @@ class CreateCamera(plugin.BaseCreator):
 
     create_as_asset_group = True
 
-    @ops.execute_function_in_main_thread
     def create(
         self, subset_name: str, instance_data: dict, pre_create_data: dict
     ):
@@ -27,13 +26,10 @@ class CreateCamera(plugin.BaseCreator):
                                      instance_data,
                                      pre_create_data)
 
+        bpy.context.view_layer.objects.active = asset_group
         if pre_create_data.get("use_selection"):
-            bpy.context.view_layer.objects.active = asset_group
-            selected = lib.get_selection()
-            for obj in selected:
-                obj.select_set(True)
-            selected.append(asset_group)
-            bpy.ops.object.parent_set(keep_transform=True)
+            for obj in lib.get_selection():
+                obj.parent = asset_group
         else:
             plugin.deselect_all()
             camera = bpy.data.cameras.new(subset_name)
@@ -42,9 +38,7 @@ class CreateCamera(plugin.BaseCreator):
             instances = bpy.data.collections.get(AVALON_INSTANCES)
             instances.objects.link(camera_obj)
 
-            camera_obj.select_set(True)
-            asset_group.select_set(True)
             bpy.context.view_layer.objects.active = asset_group
-            bpy.ops.object.parent_set(keep_transform=True)
+            camera_obj.parent = asset_group
 
         return asset_group
diff --git a/openpype/hosts/blender/plugins/create/create_layout.py b/openpype/hosts/blender/plugins/create/create_layout.py
index 05d11bf315..93fb91a324 100644
--- a/openpype/hosts/blender/plugins/create/create_layout.py
+++ b/openpype/hosts/blender/plugins/create/create_layout.py
@@ -27,10 +27,7 @@ class CreateLayout(plugin.BaseCreator):
         # Add selected objects to instance
         if pre_create_data.get("use_selection"):
             bpy.context.view_layer.objects.active = asset_group
-            selected = lib.get_selection()
-            for obj in selected:
-                obj.select_set(True)
-            selected.append(asset_group)
-            bpy.ops.object.parent_set(keep_transform=True)
+            for obj in lib.get_selection():
+                obj.parent = asset_group
 
         return asset_group
diff --git a/openpype/hosts/blender/plugins/create/create_model.py b/openpype/hosts/blender/plugins/create/create_model.py
index 7047304014..8b5eaeb999 100644
--- a/openpype/hosts/blender/plugins/create/create_model.py
+++ b/openpype/hosts/blender/plugins/create/create_model.py
@@ -2,7 +2,7 @@
 
 import bpy
 
-from openpype.hosts.blender.api import plugin, lib, ops
+from openpype.hosts.blender.api import plugin, lib
 
 
 class CreateModel(plugin.BaseCreator):
@@ -16,7 +16,6 @@ class CreateModel(plugin.BaseCreator):
 
     create_as_asset_group = True
 
-    @ops.execute_function_in_main_thread
     def create(
         self, subset_name: str, instance_data: dict, pre_create_data: dict
     ):
@@ -27,11 +26,7 @@ class CreateModel(plugin.BaseCreator):
         # Add selected objects to instance
         if pre_create_data.get("use_selection"):
             bpy.context.view_layer.objects.active = asset_group
-            selected = lib.get_selection()
-            for obj in selected:
-                obj.select_set(True)
-            selected.append(asset_group)
-
-            bpy.ops.object.parent_set(keep_transform=True)
+            for obj in lib.get_selection():
+                obj.parent = asset_group
 
         return asset_group
diff --git a/openpype/hosts/blender/plugins/create/create_rig.py b/openpype/hosts/blender/plugins/create/create_rig.py
index c7ab9b81e1..8228442249 100644
--- a/openpype/hosts/blender/plugins/create/create_rig.py
+++ b/openpype/hosts/blender/plugins/create/create_rig.py
@@ -2,7 +2,7 @@
 
 import bpy
 
-from openpype.hosts.blender.api import plugin, lib, ops
+from openpype.hosts.blender.api import plugin, lib
 
 
 class CreateRig(plugin.BaseCreator):
@@ -16,7 +16,6 @@ class CreateRig(plugin.BaseCreator):
 
     create_as_asset_group = True
 
-    @ops.execute_function_in_main_thread
     def create(
         self, subset_name: str, instance_data: dict, pre_create_data: dict
     ):
@@ -27,10 +26,7 @@ class CreateRig(plugin.BaseCreator):
         # Add selected objects to instance
         if pre_create_data.get("use_selection"):
             bpy.context.view_layer.objects.active = asset_group
-            selected = lib.get_selection()
-            for obj in selected:
-                obj.select_set(True)
-            selected.append(asset_group)
-            bpy.ops.object.parent_set(keep_transform=True)
+            for obj in lib.get_selection():
+                obj.parent = asset_group
 
         return asset_group