Merge branch 'develop' into feature/PYPE-61-publish-nuke-script-version

This commit is contained in:
Jakub Jezek 2018-12-18 18:42:42 +01:00
commit 76623dc28b
40 changed files with 42 additions and 47 deletions

View file

@ -109,8 +109,8 @@ def update_task_from_path(path):
# Find the changes between current Session and the path's context.
current = {
"asset": avalon.api.Session["AVALON_ASSET"],
"task": avalon.api.Session["AVALON_TASK"],
"app": avalon.api.Session["AVALON_APP"]
"task": avalon.api.Session["AVALON_TASK"]
# "app": avalon.api.Session["AVALON_APP"]
}
changes = {key: context[key] for key, current_value in current.items()
if context[key] != current_value}

View file

@ -4,7 +4,7 @@ from maya import cmds
from avalon.vendor import requests
import avalon.maya
from avalon import api
import os
class CreateRenderGlobals(avalon.maya.Creator):

View file

@ -33,7 +33,7 @@ class ExtractSetDress(pype.api.Extractor):
json.dump(instance.data["scenedata"], filepath, ensure_ascii=False)
self.log.info("Extracting point cache ..")
cmds.select(instance.data["\"])
cmds.select(instance.data["\\"])
# Run basic alembic exporter
extract_alembic(file=hierarchy_path,

View file

@ -17,7 +17,7 @@ class ValidateOutRelatedNodeIds(pyblish.api.InstancePlugin):
"""
order = pype.api.ValidateContentsOrder
families = ["animation', "pointcache"]
families = ["animation", "pointcache"]
hosts = ['maya']
label = 'Animation Out Set Related Node Ids'
actions = [pype.maya.action.SelectInvalidAction, pype.api.RepairAction]

View file

@ -15,7 +15,7 @@ class ValidateCameraAttributes(pyblish.api.InstancePlugin):
"""
order = pype.api.ValidateContentsOrder
families = ["camera']
families = ["camera"]
hosts = ['maya']
label = 'Camera Attributes'
actions = [pype.maya.action.SelectInvalidAction]

View file

@ -16,7 +16,7 @@ class ValidateCameraContents(pyblish.api.InstancePlugin):
"""
order = pype.api.ValidateContentsOrder
families = ["camera']
families = ["camera"]
hosts = ['maya']
label = 'Camera Contents'
actions = [pype.maya.action.SelectInvalidAction]

View file

@ -12,7 +12,7 @@ class ValidateInstancerContent(pyblish.api.InstancePlugin):
"""
order = pyblish.api.ValidatorOrder
label = 'Instancer Content'
families = ["instancer']
families = ["instancer"]
def process(self, instance):

View file

@ -44,7 +44,7 @@ class ValidateInstancerFrameRanges(pyblish.api.InstancePlugin):
"""
order = pyblish.api.ValidatorOrder
label = 'Instancer Cache Frame Ranges'
families = ["instancer']
families = ["instancer"]
@classmethod
def get_invalid(cls, instance):

View file

@ -18,7 +18,7 @@ class ValidateLookContents(pyblish.api.InstancePlugin):
"""
order = pype.api.ValidateContentsOrder
families = ["look']
families = ["look"]
hosts = ['maya']
label = 'Look Data Contents'
actions = [pype.maya.action.SelectInvalidAction]
@ -112,4 +112,4 @@ class ValidateLookContents(pyblish.api.InstancePlugin):
"files" % node)
invalid.append(node)
return invalid
return invalid

View file

@ -17,7 +17,7 @@ class ValidateLookDefaultShadersConnections(pyblish.api.InstancePlugin):
"""
order = pype.api.ValidateContentsOrder
families = ["look']
families = ["look"]
hosts = ['maya']
label = 'Look Default Shader Connections'

View file

@ -17,7 +17,7 @@ class ValidateLookIdReferenceEdits(pyblish.api.InstancePlugin):
"""
order = pype.api.ValidateContentsOrder
families = ["look']
families = ["look"]
hosts = ['maya']
label = 'Look Id Reference Edits'
actions = [pype.maya.action.SelectInvalidAction,

View file

@ -23,7 +23,7 @@ class ValidateUniqueRelationshipMembers(pyblish.api.InstancePlugin):
order = pype.api.ValidatePipelineOrder
label = 'Look members unique'
hosts = ['maya']
families = ["look']
families = ["look"]
actions = [pype.maya.action.SelectInvalidAction,
pype.maya.action.GenerateUUIDsOnInvalidAction]

View file

@ -24,13 +24,13 @@ class ValidateLookNoDefaultShaders(pyblish.api.InstancePlugin):
"""
order = pype.api.ValidateContentsOrder + 0.01
families = ["look']
families = ["look"]
hosts = ['maya']
label = 'Look No Default Shaders'
actions = [pype.maya.action.SelectInvalidAction]
DEFAULT_SHADERS = {"lambert1", "initialShadingGroup",
"initialParticleSE", "particleCloud1"}
"initialParticleSE", "particleCloud1"}
def process(self, instance):
"""Process all the nodes in the instance"""

View file

@ -37,7 +37,7 @@ class ValidateLookSets(pyblish.api.InstancePlugin):
"""
order = pype.api.ValidateContentsOrder
families = ["look']
families = ["look"]
hosts = ['maya']
label = 'Look Sets'
actions = [pype.maya.action.SelectInvalidAction]

View file

@ -13,7 +13,7 @@ class ValidateSingleShader(pyblish.api.InstancePlugin):
"""
order = pype.api.ValidateContentsOrder
families = ["look']
families = ["look"]
hosts = ['maya']
label = 'Look Single Shader Per Shape'
actions = [pype.maya.action.SelectInvalidAction]

View file

@ -47,7 +47,7 @@ class ValidateMeshHasUVs(pyblish.api.InstancePlugin):
order = pype.api.ValidateMeshOrder
hosts = ['maya']
families = ["model']
families = ["model"]
category = 'geometry'
label = 'Mesh Has UVs'
actions = [pype.maya.action.SelectInvalidAction]

View file

@ -14,7 +14,7 @@ class ValidateMeshLaminaFaces(pyblish.api.InstancePlugin):
order = pype.api.ValidateMeshOrder
hosts = ['maya']
families = ["model']
families = ["model"]
category = 'geometry'
version = (0, 1, 0)
label = 'Mesh Lamina Faces'

View file

@ -19,7 +19,7 @@ class ValidateMeshNoNegativeScale(pyblish.api.Validator):
order = pype.api.ValidateMeshOrder
hosts = ['maya']
families = ["model']
families = ["model"]
label = 'Mesh No Negative Scale'
actions = [pype.maya.action.SelectInvalidAction]

View file

@ -15,7 +15,7 @@ class ValidateMeshNonManifold(pyblish.api.Validator):
order = pype.api.ValidateMeshOrder
hosts = ['maya']
families = ["model']
families = ["model"]
label = 'Mesh Non-Manifold Vertices/Edges'
actions = [pype.maya.action.SelectInvalidAction]

View file

@ -17,7 +17,7 @@ class ValidateMeshNonZeroEdgeLength(pyblish.api.InstancePlugin):
"""
order = pype.api.ValidateMeshOrder
families = ["model']
families = ["model"]
hosts = ['maya']
category = 'geometry'
version = (0, 1, 0)

View file

@ -15,7 +15,7 @@ class ValidateMeshNormalsUnlocked(pyblish.api.Validator):
order = pype.api.ValidateMeshOrder
hosts = ['maya']
families = ["model']
families = ["model"]
category = 'geometry'
version = (0, 1, 0)
label = 'Mesh Normals Unlocked'

View file

@ -75,7 +75,7 @@ class ValidateMeshShaderConnections(pyblish.api.InstancePlugin):
order = pype.api.ValidateMeshOrder
hosts = ['maya']
families = ["model']
families = ["model"]
label = "Mesh Shader Connections"
actions = [pype.maya.action.SelectInvalidAction,
pype.api.RepairAction]

View file

@ -17,7 +17,7 @@ class ValidateMeshSingleUVSet(pyblish.api.InstancePlugin):
order = pype.api.ValidateMeshOrder
hosts = ['maya']
families = ["model', 'studio.pointcache']
families = ["model", 'studio.pointcache']
category = 'uv'
optional = True
version = (0, 1, 0)

View file

@ -17,7 +17,7 @@ class ValidateMeshUVSetMap1(pyblish.api.InstancePlugin):
order = pype.api.ValidateMeshOrder
hosts = ['maya']
families = ["model']
families = ["model"]
optional = True
label = "Mesh has map1 UV Set"
actions = [pype.maya.action.SelectInvalidAction,

View file

@ -59,7 +59,7 @@ class ValidateMeshVerticesHaveEdges(pyblish.api.InstancePlugin):
order = pype.api.ValidateMeshOrder
hosts = ['maya']
families = ["model']
families = ["model"]
category = 'geometry'
label = 'Mesh Vertices Have Edges'
actions = [pype.maya.action.SelectInvalidAction,

View file

@ -15,7 +15,7 @@ class ValidateNoDefaultCameras(pyblish.api.InstancePlugin):
order = pype.api.ValidateContentsOrder
hosts = ['maya']
families = ["camera']
families = ["camera"]
version = (0, 1, 0)
label = "No Default Cameras"
actions = [pype.maya.action.SelectInvalidAction]

View file

@ -18,7 +18,7 @@ class ValidateNoNamespace(pyblish.api.InstancePlugin):
order = pype.api.ValidateContentsOrder
hosts = ['maya']
families = ["model']
families = ["model"]
category = 'cleanup'
version = (0, 1, 0)
label = 'No Namespaces'

View file

@ -39,7 +39,7 @@ class ValidateNoNullTransforms(pyblish.api.InstancePlugin):
order = pype.api.ValidateContentsOrder
hosts = ['maya']
families = ["model']
families = ["model"]
category = 'cleanup'
version = (0, 1, 0)
label = 'No Empty/Null Transforms'

View file

@ -18,7 +18,7 @@ class ValidateNoUnknownNodes(pyblish.api.InstancePlugin):
order = pype.api.ValidateContentsOrder
hosts = ['maya']
families = ["model', 'studio.rig']
families = ["model", 'studio.rig']
optional = True
label = "Unknown Nodes"
actions = [pype.maya.action.SelectInvalidAction]

View file

@ -17,7 +17,7 @@ class ValidateNodeIdsDeformedShape(pyblish.api.InstancePlugin):
"""
order = pype.api.ValidateContentsOrder
families = ["look']
families = ["look"]
hosts = ['maya']
label = 'Deformed shape ids'
actions = [pype.maya.action.SelectInvalidAction, pype.api.RepairAction]
@ -64,4 +64,3 @@ class ValidateNodeIdsDeformedShape(pyblish.api.InstancePlugin):
continue
lib.set_id(node, history_id, overwrite=True)

View file

@ -56,6 +56,3 @@ class ValidateNodeIDsRelated(pyblish.api.InstancePlugin):
invalid.append(node)
return invalid

View file

@ -19,7 +19,7 @@ class ValidateNodeNoGhosting(pyblish.api.InstancePlugin):
order = pype.api.ValidateContentsOrder
hosts = ['maya']
families = ["model', 'studio.rig']
families = ["model", 'studio.rig']
label = "No Ghosting"
actions = [pype.maya.action.SelectInvalidAction]

View file

@ -11,7 +11,7 @@ class ValidateRenderNoDefaultCameras(pyblish.api.InstancePlugin):
order = pype.api.ValidateContentsOrder
hosts = ['maya']
families = ["renderlayer']
families = ["renderlayer"]
label = "No Default Cameras Renderable"
actions = [pype.maya.action.SelectInvalidAction]

View file

@ -19,7 +19,7 @@ class ValidateRenderSingleCamera(pyblish.api.InstancePlugin):
order = pype.api.ValidateContentsOrder
hosts = ['maya']
families = ["renderlayer']
families = ["renderlayer"]
label = "Render Single Camera"
actions = [pype.maya.action.SelectInvalidAction]

View file

@ -30,7 +30,7 @@ class ValidateSceneSetWorkspace(pyblish.api.ContextPlugin):
order = pype.api.ValidatePipelineOrder
hosts = ['maya']
families = ["model']
families = ["model"]
category = 'scene'
version = (0, 1, 0)
label = 'Maya Workspace Set'

View file

@ -33,7 +33,7 @@ class ValidateShapeDefaultNames(pyblish.api.InstancePlugin):
order = pype.api.ValidateContentsOrder
hosts = ['maya']
families = ["model']
families = ["model"]
category = 'cleanup'
optional = True
version = (0, 1, 0)

View file

@ -11,7 +11,7 @@ class ValidateShapeRenderStats(pyblish.api.Validator):
order = pype.api.ValidateMeshOrder
hosts = ['maya']
families = ["model']
families = ["model"]
label = 'Shape Default Render Stats'
actions = [pype.maya.action.SelectInvalidAction,
pype.api.RepairAction]

View file

@ -12,7 +12,7 @@ class ValidateStepSize(pyblish.api.InstancePlugin):
order = pype.api.ValidateContentsOrder
label = 'Step size'
families = ["camera',
families = ["camera",
'studio.pointcache',
'studio.animation']
actions = [pype.maya.action.SelectInvalidAction]

View file

@ -33,7 +33,7 @@ class ValidateTransformNamingSuffix(pyblish.api.InstancePlugin):
order = pype.api.ValidateContentsOrder
hosts = ['maya']
families = ["model']
families = ["model"]
category = 'cleanup'
optional = True
version = (0, 1, 0)

View file

@ -12,7 +12,7 @@ class ValidateVrayProxyMembers(pyblish.api.InstancePlugin):
order = pyblish.api.ValidatorOrder
label = 'VRay Proxy Members'
hosts = ['maya']
families = ["vrayproxy']
families = ["vrayproxy"]
actions = [pype.maya.action.SelectInvalidAction]
def process(self, instance):
@ -36,4 +36,3 @@ class ValidateVrayProxyMembers(pyblish.api.InstancePlugin):
# Return the instance itself
return [instance.name]