Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2025-12-25 05:14:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'feature/PYPE-685_better_anatomy' into develop

Browse source
This commit is contained in:
Milan Kolar 2020-01-31 21:11:57 +01:00
commit 96cfd9b60c
2 changed files with 3 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

7
pype/ftrack/events/event_user_assigment.py
View file

@ -208,11 +208,8 @@ class UserAssigmentEvent(BaseEvent):
work_dir = anatomy.format(data)['avalon']['work']
# we also need publish but not whole
filled_all = anatomy.format_all(data)
if "partial" not in filled_all:
publish = filled_all['avalon']['publish']
else:
# Backwards compatibility
publish = filled_all["partial"]['avalon']['publish']
publish = filled_all['avalon']['publish']
# now find path to {asset}
m = re.search("(^.+?{})".format(data['asset']),
publish)

7
pype/plugins/global/publish/extract_burnin.py
View file

@ -96,12 +96,7 @@ class ExtractBurnin(pype.api.Extractor):
_prep_data = copy.deepcopy(prep_data)
_prep_data["representation"] = repre["name"]
filled_anatomy = anatomy.format_all(_prep_data)
if hasattr(filled_anatomy, "get_solved"):
_filled_anatomy = filled_anatomy.get_solved()
else:
# Backwards compatibility
_filled_anatomy = filled_anatomy.get("solved")
_prep_data["anatomy"] = _filled_anatomy or {}
_prep_data["anatomy"] = filled_anatomy.get_solved()
burnin_data = {
"input": full_movie_path.replace("\\", "/"),