mirror of
https://github.com/ynput/ayon-core.git
synced 2026-01-01 16:34:53 +01:00
Merge branch 'develop' into host-openpype-chasing
This commit is contained in:
commit
785d529b39
10 changed files with 20 additions and 18 deletions
|
|
@ -1,5 +1,5 @@
|
|||
import openpype.hosts.hiero.api as phiero
|
||||
# from pype.hosts.hiero.api import plugin, lib
|
||||
# from openpype.hosts.hiero.api import plugin, lib
|
||||
# reload(lib)
|
||||
# reload(plugin)
|
||||
# reload(phiero)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
from avalon import io, api
|
||||
import openpype.hosts.hiero.api as phiero
|
||||
# from pype.hosts.hiero.api import plugin, lib
|
||||
# from openpype.hosts.hiero.api import plugin, lib
|
||||
# reload(lib)
|
||||
# reload(plugin)
|
||||
# reload(phiero)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# from pype import plugins
|
||||
# from openpype import plugins
|
||||
import os
|
||||
import json
|
||||
import pyblish.api
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ from compiler.ast import flatten
|
|||
from pyblish import api
|
||||
from openpype.hosts.hiero import api as phiero
|
||||
import hiero
|
||||
# from pype.hosts.hiero.api import lib
|
||||
# from openpype.hosts.hiero.api import lib
|
||||
# reload(lib)
|
||||
# reload(phiero)
|
||||
|
||||
|
|
|
|||
|
|
@ -32,7 +32,8 @@ class RenderSetupLoader(api.Loader):
|
|||
def load(self, context, name, namespace, data):
|
||||
"""Load RenderSetup settings."""
|
||||
from avalon.maya.pipeline import containerise
|
||||
# from openpype.maya.api.lib import namespaced
|
||||
|
||||
# from openpype.hosts.maya.api.lib import namespaced
|
||||
|
||||
asset = context['asset']['name']
|
||||
namespace = namespace or lib.unique_namespace(
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue