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

fixed conflict

Browse source
This commit is contained in:
aardschok 2017-09-22 14:01:16 +02:00
commit c9fea76abc
19 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
colorbleed/maya/lib.py
View file

@ -883,7 +883,7 @@ def assign_look(nodes, subset="lookDefault"):
version = io.find_one({"parent": subset_data['_id'],
"type": "version",
"data.families":
{"$in": ["colorbleed.lookdev"]}
{"$in": ["colorbleed.look"]}
},
sort=[("name", -1)],
projection={"_id": True})

2
colorbleed/plugins/maya/load/load_look.py
View file

@ -7,7 +7,7 @@ from avalon import api
class LookLoader(api.Loader):
"""Specific loader for lookdev"""
families = ["colorbleed.lookdev"]
families = ["colorbleed.look"]
representations = ["ma"]
label = "Reference look"

2
colorbleed/plugins/maya/publish/_validate_filename_convention.py
View file

@ -10,7 +10,7 @@ import colorbleed.api
class ValidateFileNameConvention(pyblish.api.InstancePlugin):
label = ""
families = ["colorbleed.lookdev"]
families = ["colorbleed.look"]
host = ["maya"]
optional = True

2
colorbleed/plugins/maya/publish/_validate_look_members_node_ids.py
View file

@ -11,7 +11,7 @@ class ValidateLookMembers(pyblish.api.InstancePlugin):
"""
order = colorbleed.api.ValidatePipelineOrder
families = ['colorbleed.lookdev']
families = ['colorbleed.look']
hosts = ['maya']
label = 'Look Members (ID)'
actions = [colorbleed.api.SelectInvalidAction,

2
colorbleed/plugins/maya/publish/collect_instances.py
View file

@ -46,7 +46,7 @@ class CollectInstances(pyblish.api.ContextPlugin):
"colorbleed.animation",
"colorbleed.camera",
"colorbleed.texture",
"colorbleed.lookdev",
"colorbleed.look",
"colorbleed.historyLookdev",
"colorbleed.group"]

2
colorbleed/plugins/maya/publish/collect_look.py
View file

@ -62,7 +62,7 @@ class CollectLook(pyblish.api.InstancePlugin):
"""
order = pyblish.api.CollectorOrder + 0.4
families = ["colorbleed.lookdev"]
families = ["colorbleed.look"]
label = "Collect Look"
hosts = ["maya"]

2
colorbleed/plugins/maya/publish/extract_look.py
View file

@ -21,7 +21,7 @@ class ExtractLook(colorbleed.api.Extractor):
label = "Extract Look (Maya ASCII + JSON)"
hosts = ["maya"]
families = ["colorbleed.lookdev"]
families = ["colorbleed.look"]
order = pyblish.api.ExtractorOrder + 0.2
def process(self, instance):

2
colorbleed/plugins/maya/publish/validate_look_contents.py
View file

@ -13,7 +13,7 @@ class ValidateLookContents(pyblish.api.InstancePlugin):
"""
order = colorbleed.api.ValidateContentsOrder
families = ['colorbleed.lookdev']
families = ['colorbleed.look']
hosts = ['maya']
label = 'Look Data Contents'
actions = [colorbleed.api.SelectInvalidAction]

2
colorbleed/plugins/maya/publish/validate_look_default_shaders_connections.py
View file

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

2
colorbleed/plugins/maya/publish/validate_look_deformed_shapes.py
View file

@ -104,7 +104,7 @@ class ValidateLookDeformedShapes(pyblish.api.InstancePlugin):
"""
order = colorbleed.api.ValidateContentsOrder
families = ['colorbleed.lookdev']
families = ['colorbleed.look']
hosts = ['maya']
label = 'Look deformed shapes'
actions = [colorbleed.api.SelectInvalidAction, CopyUUIDsFromHistory]

2
colorbleed/plugins/maya/publish/validate_look_ignore_color_space.py
View file

@ -18,7 +18,7 @@ class ValidateLookIgnoreColorSpace(pyblish.api.InstancePlugin):
"""
order = colorbleed.api.ValidateContentsOrder
families = ['colorbleed.lookdev']
families = ['colorbleed.look']
hosts = ['maya']
label = 'Look RAW Ignore color space'
actions = [colorbleed.api.SelectInvalidAction]

2
colorbleed/plugins/maya/publish/validate_look_members_unique.py
View file

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

2
colorbleed/plugins/maya/publish/validate_look_no_default_shaders.py
View file

@ -23,7 +23,7 @@ class ValidateLookNoDefaultShaders(pyblish.api.InstancePlugin):
"""
order = colorbleed.api.ValidateContentsOrder + 0.01
families = ['colorbleed.lookdev']
families = ['colorbleed.look']
hosts = ['maya']
label = 'Look No Default Shaders'
actions = [colorbleed.api.SelectInvalidAction]

2
colorbleed/plugins/maya/publish/validate_look_sets.py
View file

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

2
colorbleed/plugins/maya/publish/validate_look_single_shader.py
View file

@ -12,7 +12,7 @@ class ValidateSingleShader(pyblish.api.InstancePlugin):
"""
order = colorbleed.api.ValidateContentsOrder
families = ['colorbleed.lookdev']
families = ['colorbleed.look']
hosts = ['maya']
label = 'Look Single Shader Per Shape'

2
colorbleed/plugins/maya/publish/validate_node_ids.py
View file

@ -17,8 +17,8 @@ class ValidateNodeIDs(pyblish.api.InstancePlugin):
label = 'Instance Nodes Have ID'
hosts = ['maya']
families = ["colorbleed.model",
"colorbleed.lookdev",
"colorbleed.pointcache",
"colorbleed.look",
"colorbleed.rig"]
actions = [colorbleed.api.SelectInvalidAction,

2
colorbleed/plugins/maya/publish/validate_node_ids_related.py
View file

@ -15,7 +15,7 @@ class ValidateNodeIDsRelated(pyblish.api.InstancePlugin):
label = 'Node Ids Related (ID)'
hosts = ['maya']
families = ["colorbleed.model",
"colorbleed.lookdev",
"colorbleed.look",
"colorbleed.rig"]
actions = [colorbleed.api.SelectInvalidAction,

2
colorbleed/plugins/maya/publish/validate_unique_node_ids.py
View file

@ -15,7 +15,7 @@ class ValidateNonDuplicateInstanceMembers(pyblish.api.InstancePlugin):
label = 'Non Duplicate Instance Members (ID)'
hosts = ['maya']
families = ["colorbleed.model",
"colorbleed.lookdev",
"colorbleed.look",
"colorbleed.rig"]
actions = [colorbleed.api.SelectInvalidAction,

2
colorbleed/plugins/publish/integrate.py
View file

@ -28,7 +28,7 @@ class IntegrateAsset(pyblish.api.InstancePlugin):
"colorbleed.animation",
"colorbleed.pointcache",
"colorbleed.camera",
"colorbleed.lookdev",
"colorbleed.look",
"colorbleed.texture",
"colorbleed.historyLookdev",
"colorbleed.group",