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

hotfix/minot fixes for submitting maya to deadline in 2.0

Browse source
This commit is contained in:
Milan Kolar 2019-05-10 17:10:31 +02:00
parent 91ab9e3c5f
commit 6868859aea
4 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pype/ftrack/lib/ftrack_app_handler.py
View file

@ -193,7 +193,7 @@ class AppAction(BaseHandler):
application = avalonlib.get_application(os.environ["AVALON_APP_NAME"]) application = avalonlib.get_application(os.environ["AVALON_APP_NAME"])
data = { data = {
"root": os.environ.get("PYPE_STUDIO_PROJECTS_PATH"), "root": os.environ.get("PYPE_STUDIO_PROJECTS_MOUNT"),
"project": { "project": {
"name": entity['project']['full_name'], "name": entity['project']['full_name'],
"code": entity['project']['name'] "code": entity['project']['name']

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

@ -1,8 +1,8 @@
import os import os
import pyblish.api import pyblish.api
import os
import pype.api as pype import pype.api as pype
class CollectSceneVersion(pyblish.api.ContextPlugin): class CollectSceneVersion(pyblish.api.ContextPlugin):
"""Finds version in the filename or passes the one found in the context """Finds version in the filename or passes the one found in the context
Arguments: Arguments:
@ -16,8 +16,10 @@ class CollectSceneVersion(pyblish.api.ContextPlugin):
filename = os.path.basename(context.data.get('currentFile')) filename = os.path.basename(context.data.get('currentFile'))
rootVersion = pype.get_version_from_path(filename) if '<shell>' in filename:
return
rootVersion = pype.get_version_from_path(filename)
context.data['version'] = rootVersion context.data['version'] = rootVersion
self.log.info('Scene Version: %s' % context.data('version')) self.log.info('Scene Version: %s' % context.data('version'))

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

@ -21,11 +21,14 @@ class CollectMayaRenderlayers(pyblish.api.ContextPlugin):
# Get render globals node # Get render globals node
try: try:
render_globals = cmds.ls("renderglobalsMain")[0] 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: except IndexError:
self.log.info("Skipping renderlayer collection, no " self.log.info("Skipping renderlayer collection, no "
"renderGlobalsDefault found..") "renderGlobalsDefault found..")
return return
# Get all valid renderlayers # Get all valid renderlayers
# This is how Maya populates the renderlayer display # This is how Maya populates the renderlayer display
rlm_attribute = "renderLayerManager.renderLayerId" rlm_attribute = "renderLayerManager.renderLayerId"
@ -51,7 +54,7 @@ class CollectMayaRenderlayers(pyblish.api.ContextPlugin):
continue continue
if layer.endswith("defaultRenderLayer"): if layer.endswith("defaultRenderLayer"):
layername = "masterLayer" continue
else: else:
# Remove Maya render setup prefix `rs_` # Remove Maya render setup prefix `rs_`
layername = layer.split("rs_", 1)[-1] 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('python2', 'python3')
clean_path = clean_path.replace( clean_path = clean_path.replace(
os.path.normpath(environment['PYPE_STUDIO_CORE_MOUNT']), 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 clean_environment[key] = clean_path
environment = clean_environment environment = clean_environment