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

Merge branch '2.0/develop' into develop

Browse source
This commit is contained in:
Milan Kolar 2019-05-20 18:44:28 +02:00
commit 2460cd1fdc
236 changed files with 13976 additions and 1252 deletions
Download patch file Download diff file Expand all files Collapse all files

7
pype/plugins/maya/publish/collect_renderlayers.py
View file

@ -21,11 +21,14 @@ class CollectMayaRenderlayers(pyblish.api.ContextPlugin):
# Get render globals node
try:
render_globals = cmds.ls("renderglobalsMain")[0]
for instance in context:
self.log.debug(instance.name)
if instance.data['family'] == 'workfile':
instance.data['publish'] = True
except IndexError:
self.log.info("Skipping renderlayer collection, no "
"renderGlobalsDefault found..")
return
# Get all valid renderlayers
# This is how Maya populates the renderlayer display
rlm_attribute = "renderLayerManager.renderLayerId"
@ -51,7 +54,7 @@ class CollectMayaRenderlayers(pyblish.api.ContextPlugin):
continue
if layer.endswith("defaultRenderLayer"):
layername = "masterLayer"
continue
else:
# Remove Maya render setup prefix `rs_`
layername = layer.split("rs_", 1)[-1]

2
pype/plugins/maya/publish/submit_maya_deadline.py
View file

@ -280,7 +280,7 @@ class MayaSubmitDeadline(pyblish.api.InstancePlugin):
clean_path = clean_path.replace('python2', 'python3')
clean_path = clean_path.replace(
os.path.normpath(environment['PYPE_STUDIO_CORE_MOUNT']),
os.path.normpath(environment['PYPE_STUDIO_CORE']))
os.path.normpath(environment['PYPE_STUDIO_CORE_PATH']))
clean_environment[key] = clean_path
environment = clean_environment