From 6a91d14cc6bb0245799312e27472ef1ff7865eab Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Mon, 3 Jun 2024 22:01:02 +0200 Subject: [PATCH] Fix refactor --- server_addon/houdini/client/ayon_houdini/api/usd.py | 2 +- .../client/ayon_houdini/plugins/create/create_usd_look.py | 2 +- .../client/ayon_houdini/plugins/publish/collect_usd_render.py | 4 ++-- .../ayon_houdini/plugins/publish/validate_render_products.py | 2 +- .../plugins/publish/validate_usd_look_assignments.py | 2 +- .../plugins/publish/validate_usd_look_contents.py | 4 ++-- .../plugins/publish/validate_usd_look_material_defs.py | 4 ++-- .../plugins/publish/validate_usd_render_arnold.py | 4 ++-- .../plugins/publish/validate_usd_rop_default_prim.py | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/server_addon/houdini/client/ayon_houdini/api/usd.py b/server_addon/houdini/client/ayon_houdini/api/usd.py index c60521bc59..9b10702254 100644 --- a/server_addon/houdini/client/ayon_houdini/api/usd.py +++ b/server_addon/houdini/client/ayon_houdini/api/usd.py @@ -286,7 +286,7 @@ def setup_lop_python_layer(layer, node, savepath=None, @contextlib.contextmanager def remap_paths(rop_node, mapping): """Enable the AyonRemapPaths output processor with provided `mapping`""" - from ayon_core.hosts.houdini.api.lib import parm_values + from ayon_houdini.api.lib import parm_values if not mapping: # Do nothing diff --git a/server_addon/houdini/client/ayon_houdini/plugins/create/create_usd_look.py b/server_addon/houdini/client/ayon_houdini/plugins/create/create_usd_look.py index 02e6e0e659..5ecf9749dc 100644 --- a/server_addon/houdini/client/ayon_houdini/plugins/create/create_usd_look.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/create/create_usd_look.py @@ -2,7 +2,7 @@ """Creator plugin for creating USD looks with textures.""" import inspect -from ayon_core.hosts.houdini.api import plugin +from ayon_houdini.api import plugin import hou diff --git a/server_addon/houdini/client/ayon_houdini/plugins/publish/collect_usd_render.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/collect_usd_render.py index 7e741b2006..e0f149e787 100644 --- a/server_addon/houdini/client/ayon_houdini/plugins/publish/collect_usd_render.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/collect_usd_render.py @@ -4,8 +4,8 @@ import re import hou import pyblish.api -from ayon_core.hosts.houdini.api import colorspace -from ayon_core.hosts.houdini.api.lib import ( +from ayon_houdini.api import colorspace +from ayon_houdini.api.lib import ( evalParmNoFrame, get_color_management_preferences ) diff --git a/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_render_products.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_render_products.py index d1b8374324..595f48a043 100644 --- a/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_render_products.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_render_products.py @@ -3,7 +3,7 @@ import inspect import pyblish.api from ayon_core.pipeline import PublishValidationError -from ayon_core.hosts.houdini.api.action import SelectROPAction +from ayon_houdini.api.action import SelectROPAction import hou diff --git a/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_usd_look_assignments.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_usd_look_assignments.py index bf5a224dc7..f96b5a383e 100644 --- a/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_usd_look_assignments.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_usd_look_assignments.py @@ -7,7 +7,7 @@ from ayon_core.pipeline.publish import ( PublishValidationError, OptionalPyblishPluginMixin ) -from ayon_core.hosts.houdini.api.action import SelectROPAction +from ayon_houdini.api.action import SelectROPAction import hou from pxr import Usd, UsdShade, UsdGeom diff --git a/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_usd_look_contents.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_usd_look_contents.py index 8c2332a55c..d7bfff8c35 100644 --- a/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_usd_look_contents.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_usd_look_contents.py @@ -6,8 +6,8 @@ from functools import partial import pyblish.api from ayon_core.pipeline.publish import PublishValidationError -from ayon_core.hosts.houdini.api.action import SelectROPAction -from ayon_core.hosts.houdini.api.usd import get_schema_type_names +from ayon_houdini.api.action import SelectROPAction +from ayon_houdini.api.usd import get_schema_type_names import hou from pxr import Sdf diff --git a/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_usd_look_material_defs.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_usd_look_material_defs.py index 471300276f..fb146b3313 100644 --- a/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_usd_look_material_defs.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_usd_look_material_defs.py @@ -7,8 +7,8 @@ from ayon_core.pipeline.publish import ( PublishValidationError, OptionalPyblishPluginMixin ) -from ayon_core.hosts.houdini.api.action import SelectROPAction -from ayon_core.hosts.houdini.api.usd import get_schema_type_names +from ayon_houdini.api.action import SelectROPAction +from ayon_houdini.api.usd import get_schema_type_names import hou from pxr import Sdf, UsdShade diff --git a/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_usd_render_arnold.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_usd_render_arnold.py index dfe1e4838c..2cfb9aec58 100644 --- a/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_usd_render_arnold.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_usd_render_arnold.py @@ -4,8 +4,8 @@ import inspect import pyblish.api from ayon_core.pipeline.publish import PublishValidationError, RepairAction -from ayon_core.hosts.houdini.api.action import SelectROPAction -from ayon_core.hosts.houdini.api.usd import get_usd_render_rop_rendersettings +from ayon_houdini.api.action import SelectROPAction +from ayon_houdini.api.usd import get_usd_render_rop_rendersettings import hou import pxr diff --git a/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_usd_rop_default_prim.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_usd_rop_default_prim.py index 050eae3090..45e77b24fe 100644 --- a/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_usd_rop_default_prim.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_usd_rop_default_prim.py @@ -3,7 +3,7 @@ import inspect import pyblish.api -from ayon_core.hosts.houdini.api.action import SelectROPAction +from ayon_houdini.api.action import SelectROPAction from ayon_core.pipeline import PublishValidationError import hou