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/AY-7717_nuke-multiple-intermediate-fails-thumbnail-in-integrator_1241

Browse source
This commit is contained in:
Jakub Ježek 2025-04-15 15:50:47 +02:00 • committed by GitHub
commit 602a17999d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
client/ayon_core/plugins/publish/integrate.py
View file

@ -619,8 +619,7 @@ class IntegrateAsset(pyblish.api.InstancePlugin):
# used for all represe # used for all represe
# from temp to final # from temp to final
original_directory = ( original_directory = (
instance.data.get("originalDirname") or instance_stagingdir) instance.data.get("originalDirname") or stagingdir)
_rootless = self.get_rootless_path(anatomy, original_directory) _rootless = self.get_rootless_path(anatomy, original_directory)
if _rootless == original_directory: if _rootless == original_directory:
raise KnownPublishError(( raise KnownPublishError((

2
client/ayon_core/version.py
View file

@ -1,3 +1,3 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
"""Package declaring AYON addon 'core' version.""" """Package declaring AYON addon 'core' version."""
__version__ = "1.1.7+dev" __version__ = "1.1.8+dev"

2
package.py
View file

@ -1,6 +1,6 @@
name = "core" name = "core"
title = "Core" title = "Core"
version = "1.1.7+dev" version = "1.1.8+dev"
client_dir = "ayon_core" client_dir = "ayon_core"

2
pyproject.toml
View file

@ -5,7 +5,7 @@
[tool.poetry] [tool.poetry]
name = "ayon-core" name = "ayon-core"
version = "1.1.7+dev" version = "1.1.8+dev"
description = "" description = ""
authors = ["Ynput Team <team@ynput.io>"] authors = ["Ynput Team <team@ynput.io>"]
readme = "README.md" readme = "README.md"