Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2026-01-01 08:24:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into bugfix/maya_wrong_attrs_declaration

Browse source
This commit is contained in:
Petr Kalis 2022-10-12 19:03:40 +02:00 • committed by GitHub
commit 0bd51e7c7d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
openpype/hosts/houdini/plugins/load/load_image.py
View file

@ -73,7 +73,7 @@ class ImageLoader(load.LoaderPlugin):
# Imprint it manually # Imprint it manually
data = { data = {
"schema": "avalon-core:container-2.0", "schema": "openpype:container-2.0",
"id": AVALON_CONTAINER_ID, "id": AVALON_CONTAINER_ID,
"name": node_name, "name": node_name,
"namespace": namespace, "namespace": namespace,

2
openpype/hosts/houdini/plugins/load/load_usd_layer.py
View file

@ -43,7 +43,7 @@ class USDSublayerLoader(load.LoaderPlugin):
# Imprint it manually # Imprint it manually
data = { data = {
"schema": "avalon-core:container-2.0", "schema": "openpype:container-2.0",
"id": AVALON_CONTAINER_ID, "id": AVALON_CONTAINER_ID,
"name": node_name, "name": node_name,
"namespace": namespace, "namespace": namespace,

2
openpype/hosts/houdini/plugins/load/load_usd_reference.py
View file

@ -43,7 +43,7 @@ class USDReferenceLoader(load.LoaderPlugin):
# Imprint it manually # Imprint it manually
data = { data = {
"schema": "avalon-core:container-2.0", "schema": "openpype:container-2.0",
"id": AVALON_CONTAINER_ID, "id": AVALON_CONTAINER_ID,
"name": node_name, "name": node_name,
"namespace": namespace, "namespace": namespace,

15
openpype/hosts/maya/addon.py
View file

@ -28,13 +28,16 @@ class MayaAddon(OpenPypeModule, IHostAddon):
env["PYTHONPATH"] = os.pathsep.join(new_python_paths) env["PYTHONPATH"] = os.pathsep.join(new_python_paths)
# Set default values if are not already set via settings # Set default environments
defaults = { envs = {
"OPENPYPE_LOG_NO_COLORS": "Yes" "OPENPYPE_LOG_NO_COLORS": "Yes",
# For python module 'qtpy'
"QT_API": "PySide2",
# For python module 'Qt'
"QT_PREFERRED_BINDING": "PySide2"
} }
for key, value in defaults.items(): for key, value in envs.items():
if not env.get(key): env[key] = value
env[key] = value
def get_launch_hook_paths(self, app): def get_launch_hook_paths(self, app):
if app.host_name != self.host_name: if app.host_name != self.host_name: