Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2025-12-26 13:52:15 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

🔀 Merge branch 'origin/develop'

Browse source
This commit is contained in:
Ondrej Samohel 2022-10-21 18:13:08 +02:00
commit 3efd0b4529
No known key found for this signature in database
GPG key ID: 02376E18990A97C6
5 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
openpype/hosts/hiero/api/pipeline.py
View file

@ -251,7 +251,6 @@ def reload_config():
import importlib
for module in (
"openpype.api",
"openpype.hosts.hiero.lib",
"openpype.hosts.hiero.menu",
"openpype.hosts.hiero.tags"

5
openpype/hosts/hiero/plugins/publish/integrate_version_up_workfile.py
View file

@ -1,5 +1,6 @@
from pyblish import api
import openpype.api as pype
from openpype.lib import version_up
class IntegrateVersionUpWorkfile(api.ContextPlugin):
@ -15,7 +16,7 @@ class IntegrateVersionUpWorkfile(api.ContextPlugin):
def process(self, context):
project = context.data["activeProject"]
path = context.data.get("currentFile")
new_path = pype.version_up(path)
new_path = version_up(path)
if project:
project.saveAs(new_path)

1
openpype/hosts/nuke/api/pipeline.py
View file

@ -66,7 +66,6 @@ def reload_config():
"""
for module in (
"openpype.api",
"openpype.hosts.nuke.api.actions",
"openpype.hosts.nuke.api.menu",
"openpype.hosts.nuke.api.plugin",

5
openpype/hosts/nuke/plugins/publish/precollect_workfile.py
View file

@ -3,7 +3,8 @@ import os
import nuke
import pyblish.api
import openpype.api as pype
from openpype.lib import get_version_from_path
from openpype.hosts.nuke.api.lib import (
add_publish_knob,
get_avalon_knob_data
@ -74,7 +75,7 @@ class CollectWorkfile(pyblish.api.ContextPlugin):
"fps": root['fps'].value(),
"currentFile": current_file,
"version": int(pype.get_version_from_path(current_file)),
"version": int(get_version_from_path(current_file)),
"host": pyblish.api.current_host(),
"hostVersion": nuke.NUKE_VERSION_STRING

4
openpype/hosts/traypublisher/api/plugin.py
View file

@ -37,7 +37,7 @@ class HiddenTrayPublishCreator(HiddenCreator):
host_name = "traypublisher"
def collect_instances(self):
for instance_data in _cache_and_get_instances():
for instance_data in _cache_and_get_instances(self):
creator_id = instance_data.get("creator_identifier")
if creator_id == self.identifier:
instance = CreatedInstance.from_existing(
@ -74,7 +74,7 @@ class TrayPublishCreator(Creator):
host_name = "traypublisher"
def collect_instances(self):
for instance_data in _cache_and_get_instances():
for instance_data in _cache_and_get_instances(self):
creator_id = instance_data.get("creator_identifier")
if creator_id == self.identifier:
instance = CreatedInstance.from_existing(