Skip to content
This repository has been archived by the owner on Sep 20, 2024. It is now read-only.

Commit

Permalink
Merge pull request #39 from pypeclub/bugfix/string_import
Browse files Browse the repository at this point in the history
Fix string imports
  • Loading branch information
mkolar authored Apr 1, 2021
2 parents 7b41968 + 304a6a9 commit 0bf9158
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion openpype/hosts/hiero/plugins/create/create_shot_clip.py
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion openpype/hosts/hiero/plugins/load/load_clip.py
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# from pype import plugins
# from openpype import plugins
import os
import json
import pyblish.api
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
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)

Expand Down
2 changes: 1 addition & 1 deletion openpype/hosts/houdini/startup/MainMenuCommon.XML
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ publish.show(parent)
<label>Work Files ...</label>
<scriptCode><![CDATA[
import hou, os
from pype.tools import workfiles
from openpype.tools import workfiles
workfiles.show(os.environ["AVALON_WORKDIR"])
]]></scriptCode>
</scriptItem>
Expand Down
12 changes: 6 additions & 6 deletions openpype/hosts/maya/api/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -136,13 +136,13 @@ def on_open(_):
from openpype.widgets import popup

cmds.evalDeferred(
"from pype.hosts.maya.api import lib;"
"from openpype.hosts.maya.api import lib;"
"lib.remove_render_layer_observer()")
cmds.evalDeferred(
"from pype.hosts.maya.api import lib;"
"from openpype.hosts.maya.api import lib;"
"lib.add_render_layer_observer()")
cmds.evalDeferred(
"from pype.hosts.maya.api import lib;"
"from openpype.hosts.maya.api import lib;"
"lib.add_render_layer_change_observer()")
# # Update current task for the current scene
# update_task_from_path(cmds.file(query=True, sceneName=True))
Expand Down Expand Up @@ -183,13 +183,13 @@ def on_new(_):
avalon.logger.info("Running callback on new..")
with suspended_refresh():
cmds.evalDeferred(
"from pype.hosts.maya.api import lib;"
"from openpype.hosts.maya.api import lib;"
"lib.remove_render_layer_observer()")
cmds.evalDeferred(
"from pype.hosts.maya.api import lib;"
"from openpype.hosts.maya.api import lib;"
"lib.add_render_layer_observer()")
cmds.evalDeferred(
"from pype.hosts.maya.api import lib;"
"from openpype.hosts.maya.api import lib;"
"lib.add_render_layer_change_observer()")
lib.set_context_settings()

Expand Down
2 changes: 1 addition & 1 deletion openpype/hosts/maya/api/menu.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
},
{
"type": "action",
"command": "from pype.tools.assetcreator import app as assetcreator; assetcreator.show(context='maya')",
"command": "from openpype.tools.assetcreator import app as assetcreator; assetcreator.show(context='maya')",
"sourcetype": "python",
"title": "Asset Creator",
"tooltip": "Open the Asset Creator"
Expand Down
2 changes: 1 addition & 1 deletion openpype/hosts/maya/plugins/load/load_rendersetup.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class RenderSetupLoader(api.Loader):
def load(self, context, name, namespace, data):
"""Load RenderSetup settings."""
from avalon.maya.pipeline import containerise
# from pype.hosts.maya.api.lib import namespaced
# from openpype.hosts.maya.api.lib import namespaced

asset = context['asset']['name']
namespace = namespace or lib.unique_namespace(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
import pyblish.api
from avalon import io

# Copy of constant `pype.modules.ftrack.lib.avalon_sync.CUST_ATTR_AUTO_SYNC`
# Copy of constant `openpype.modules.ftrack.lib.avalon_sync.CUST_ATTR_AUTO_SYNC`
CUST_ATTR_AUTO_SYNC = "avalon_auto_sync"
CUST_ATTR_GROUP = "openpype"


# Copy of `get_pype_attr` from pype.modules.ftrack.lib
# Copy of `get_pype_attr` from openpype.modules.ftrack.lib
# TODO import from openpype's ftrack module when possible to not break Python 2
def get_pype_attr(session, split_hierarchical=True):
custom_attributes = []
Expand Down

0 comments on commit 0bf9158

Please sign in to comment.