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

cleanup conflicts

Browse source
This commit is contained in:
Milan Kolar 2019-02-17 21:26:29 +01:00
parent d58778e925
commit bf7d25fd94
2 changed files with 0 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

7
pype/lib.py
View file

@ -427,13 +427,6 @@ def get_avalon_project_template():
proj_template['workfile'] = template.anatomy.avalon.workfile
proj_template['work'] = template.anatomy.avalon.work
proj_template['publish'] = template.anatomy.avalon.publish
<<<<<<< HEAD
=======
# Old - hardcoded = BackUp
# proj_template['workfile'] = "{asset[name]}_{task[name]}_v{version:0>3}<_{comment}>"
# proj_template['work'] = "{root}/{project}/{hierarchy}/{asset}/work/{task}"
# proj_template['publish'] = "{root}/{project}/{hierarchy}/{asset}/publish/{family}/{subset}/v{version}/{projectcode}_{asset}_{subset}_v{version}.{representation}"
>>>>>>> develop
return proj_template

6
pype/plugins/global/publish/integrate_rendered_frames.py
View file

@ -258,17 +258,11 @@ class IntegrateFrames(pyblish.api.InstancePlugin):
# for performance reasons.
"context": {
"root": root,
<<<<<<< HEAD
"project": {
"name": PROJECT,
"code": project['data']['code']
},
"task": api.Session["AVALON_TASK"],
=======
"project": {"name": PROJECT,
"code": project['data']['code']},
'task': api.Session["AVALON_TASK"],
>>>>>>> develop
"silo": asset['silo'],
"asset": ASSET,
"family": instance.data['family'],