diff --git a/pype/fusion/__init__.py b/pype/fusion/__init__.py index 8ae042c934..d6efaa54d3 100644 --- a/pype/fusion/__init__.py +++ b/pype/fusion/__init__.py @@ -24,9 +24,9 @@ def install(): pyblish.register_callback("instanceToggled", on_pyblish_instance_toggled) # Disable all families except for the ones we explicitly want to see - family_states = ["colorbleed.imagesequence", - "colorbleed.camera", - "colorbleed.pointcache"] + family_states = ["imagesequence", + "camera", + "pointcache"] avalon.data["familiesStateDefault"] = False avalon.data["familiesStateToggled"] = family_states diff --git a/pype/houdini/__init__.py b/pype/houdini/__init__.py index 05d5195605..f432a4a5e5 100644 --- a/pype/houdini/__init__.py +++ b/pype/houdini/__init__.py @@ -8,9 +8,9 @@ from pyblish import api as pyblish from avalon import api as avalon from avalon.houdini import pipeline as houdini -from colorbleed.houdini import lib +from pype.houdini import lib -from colorbleed.lib import ( +from pype.lib import ( any_outdated, update_task_from_path ) @@ -24,7 +24,7 @@ PUBLISH_PATH = os.path.join(PLUGINS_DIR, "houdini", "publish") LOAD_PATH = os.path.join(PLUGINS_DIR, "houdini", "load") CREATE_PATH = os.path.join(PLUGINS_DIR, "houdini", "create") -log = logging.getLogger("colorbleed.houdini") +log = logging.getLogger("pype.houdini") def install(): @@ -42,7 +42,7 @@ def install(): pyblish.register_callback("instanceToggled", on_pyblish_instance_toggled) log.info("Setting default family states for loader..") - avalon.data["familiesStateToggled"] = ["colorbleed.imagesequence"] + avalon.data["familiesStateToggled"] = ["imagesequence"] def on_init(*args): diff --git a/pype/houdini/lib.py b/pype/houdini/lib.py index 179cb0670d..e1e95912ee 100644 --- a/pype/houdini/lib.py +++ b/pype/houdini/lib.py @@ -4,7 +4,7 @@ from contextlib import contextmanager import hou -from colorbleed import lib +from pype import lib from avalon import api, io from avalon.houdini import lib as houdini diff --git a/pype/lib.py b/pype/lib.py index edd911a461..3ce1441e3d 100644 --- a/pype/lib.py +++ b/pype/lib.py @@ -262,7 +262,7 @@ def collect_container_metadata(container): """ # TODO: Improve method of getting the host lib module host_name = _get_host_name() - package_name = "colorbleed.{}.lib".format(host_name) + package_name = "pype.{}.lib".format(host_name) hostlib = importlib.import_module(package_name) if not hasattr(hostlib, "get_additional_data"): diff --git a/pype/maya/__init__.py b/pype/maya/__init__.py index 6e6d0ca869..68af530bcd 100644 --- a/pype/maya/__init__.py +++ b/pype/maya/__init__.py @@ -15,7 +15,7 @@ from ..lib import ( from . import menu from . import lib -log = logging.getLogger("colorbleed.maya") +log = logging.getLogger("pype.maya") PARENT_DIR = os.path.dirname(__file__) PACKAGE_DIR = os.path.dirname(PARENT_DIR) @@ -52,7 +52,7 @@ def install(): override_event("taskChanged", on_task_changed) log.info("Setting default family states for loader..") - avalon.data["familiesStateToggled"] = ["colorbleed.imagesequence"] + avalon.data["familiesStateToggled"] = ["imagesequence"] def uninstall(): diff --git a/pype/maya/action.py b/pype/maya/action.py index f0f94516c0..6281a82409 100644 --- a/pype/maya/action.py +++ b/pype/maya/action.py @@ -72,7 +72,7 @@ class GenerateUUIDsOnInvalidAction(pyblish.api.Action): nodes (list): all nodes to regenerate ids on """ - import colorbleed.maya.lib as lib + import pype.maya.lib as lib import avalon.io as io asset = instance.data['asset'] diff --git a/pype/maya/customize.py b/pype/maya/customize.py index 8b2dda7540..46c9ceb652 100644 --- a/pype/maya/customize.py +++ b/pype/maya/customize.py @@ -70,8 +70,8 @@ def override_component_mask_commands(): def override_toolbox_ui(): """Add custom buttons in Toolbox as replacement for Maya web help icon.""" - import colorbleed - res = os.path.join(os.path.dirname(os.path.dirname(colorbleed.__file__)), + import pype + res = os.path.join(os.path.dirname(os.path.dirname(pype.__file__)), "res") icons = os.path.join(res, "icons") @@ -99,7 +99,7 @@ def override_toolbox_ui(): controls = [] control = mc.iconTextButton( - "colorbleed_toolbox_workfiles", + "pype_toolbox_workfiles", annotation="Work Files", label="Work Files", image=os.path.join(icons, "workfiles.png"), @@ -111,7 +111,7 @@ def override_toolbox_ui(): controls.append(control) control = mc.iconTextButton( - "colorbleed_toolbox_loader", + "pype_toolbox_loader", annotation="Loader", label="Loader", image=os.path.join(icons, "loader.png"), @@ -123,7 +123,7 @@ def override_toolbox_ui(): controls.append(control) control = mc.iconTextButton( - "colorbleed_toolbox_manager", + "pype_toolbox_manager", annotation="Inventory", label="Inventory", image=os.path.join(icons, "inventory.png"), @@ -135,10 +135,10 @@ def override_toolbox_ui(): controls.append(control) control = mc.iconTextButton( - "colorbleed_toolbox", + "pype_toolbox", annotation="Colorbleed", label="Colorbleed", - image=os.path.join(icons, "colorbleed_logo_36x36.png"), + image=os.path.join(icons, "pype_logo_36x36.png"), bgc=background_color, width=icon_size, height=icon_size, diff --git a/pype/maya/lib.py b/pype/maya/lib.py index e78b185125..26c3cbcb3a 100644 --- a/pype/maya/lib.py +++ b/pype/maya/lib.py @@ -17,7 +17,7 @@ from avalon import api, maya, io, pipeline from avalon.vendor.six import string_types import avalon.maya.lib -from colorbleed import lib +from pype import lib log = logging.getLogger(__name__) @@ -1368,11 +1368,11 @@ def assign_look(nodes, subset="lookDefault"): # Group all nodes per asset id grouped = defaultdict(list) for node in nodes: - colorbleed_id = get_id(node) - if not colorbleed_id: + pype_id = get_id(node) + if not pype_id: continue - parts = colorbleed_id.split(":", 1) + parts = pype_id.split(":", 1) grouped[parts[0]].append(node) for asset_id, asset_nodes in grouped.items(): @@ -1395,7 +1395,7 @@ def assign_look(nodes, subset="lookDefault"): version = io.find_one({"parent": subset_data['_id'], "type": "version", "data.families": - {"$in": ["colorbleed.look"]} + {"$in": ["look"]} }, sort=[("name", -1)], projection={"_id": True, "name": True}) diff --git a/pype/maya/menu.json b/pype/maya/menu.json index a6ecea4b11..848410f002 100644 --- a/pype/maya/menu.json +++ b/pype/maya/menu.json @@ -1536,7 +1536,7 @@ }, { "type": "action", - "command": "$COLORBLEED_SCRIPTS\\cleanup\\colorbleedRename.py", + "command": "$COLORBLEED_SCRIPTS\\cleanup\\pypeRename.py", "sourcetype": "file", "tags": ["cleanup", "rename", diff --git a/pype/maya/menu.py b/pype/maya/menu.py index 9223271d65..ed5115c274 100644 --- a/pype/maya/menu.py +++ b/pype/maya/menu.py @@ -7,7 +7,7 @@ from avalon.vendor.Qt import QtWidgets, QtCore, QtGui import maya.cmds as cmds self = sys.modules[__name__] -self._menu = "colorbleed" +self._menu = "pype" log = logging.getLogger(__name__) @@ -29,7 +29,7 @@ def deferred(): import scriptsmenu.launchformaya as launchformaya import scriptsmenu.scriptsmenu as scriptsmenu except ImportError: - log.warning("Skipping colorbleed.menu install, because " + log.warning("Skipping pype.menu install, because " "'scriptsmenu' module seems unavailable.") return @@ -61,7 +61,7 @@ def uninstall(): def install(): if cmds.about(batch=True): - print("Skipping colorbleed.menu initialization in batch mode..") + print("Skipping pype.menu initialization in batch mode..") return uninstall() diff --git a/pype/plugins/fusion/create/create_tiff_saver.py b/pype/plugins/fusion/create/create_tiff_saver.py index b313ca994f..4911650ed2 100644 --- a/pype/plugins/fusion/create/create_tiff_saver.py +++ b/pype/plugins/fusion/create/create_tiff_saver.py @@ -9,7 +9,7 @@ class CreateTiffSaver(avalon.api.Creator): name = "tiffDefault" label = "Create Tiff Saver" hosts = ["fusion"] - family = "colorbleed.saver" + family = "saver" def process(self): diff --git a/pype/plugins/fusion/load/actions.py b/pype/plugins/fusion/load/actions.py index c986229748..d7ee13716b 100644 --- a/pype/plugins/fusion/load/actions.py +++ b/pype/plugins/fusion/load/actions.py @@ -8,11 +8,11 @@ from avalon import api class FusionSetFrameRangeLoader(api.Loader): """Specific loader of Alembic for the avalon.animation family""" - families = ["colorbleed.animation", - "colorbleed.camera", - "colorbleed.imagesequence", - "colorbleed.yeticache", - "colorbleed.pointcache"] + families = ["animation", + "camera", + "imagesequence", + "yeticache", + "pointcache"] representations = ["*"] label = "Set frame range" @@ -22,7 +22,7 @@ class FusionSetFrameRangeLoader(api.Loader): def load(self, context, name, namespace, data): - from colorbleed.fusion import lib + from pype.fusion import lib version = context['version'] version_data = version.get("data", {}) @@ -41,11 +41,11 @@ class FusionSetFrameRangeLoader(api.Loader): class FusionSetFrameRangeWithHandlesLoader(api.Loader): """Specific loader of Alembic for the avalon.animation family""" - families = ["colorbleed.animation", - "colorbleed.camera", - "colorbleed.imagesequence", - "colorbleed.yeticache", - "colorbleed.pointcache"] + families = ["animation", + "camera", + "imagesequence", + "yeticache", + "pointcache"] representations = ["*"] label = "Set frame range (with handles)" @@ -55,7 +55,7 @@ class FusionSetFrameRangeWithHandlesLoader(api.Loader): def load(self, context, name, namespace, data): - from colorbleed.fusion import lib + from pype.fusion import lib version = context['version'] version_data = version.get("data", {}) diff --git a/pype/plugins/fusion/load/load_sequence.py b/pype/plugins/fusion/load/load_sequence.py index 81313992ed..7b859e9b03 100644 --- a/pype/plugins/fusion/load/load_sequence.py +++ b/pype/plugins/fusion/load/load_sequence.py @@ -113,7 +113,7 @@ def loader_shift(loader, frame, relative=True): class FusionLoadSequence(api.Loader): """Load image sequence into Fusion""" - families = ["colorbleed.imagesequence"] + families = ["imagesequence"] representations = ["*"] label = "Load sequence" diff --git a/pype/plugins/fusion/publish/collect_instances.py b/pype/plugins/fusion/publish/collect_instances.py index 322197fc87..472e5d4741 100644 --- a/pype/plugins/fusion/publish/collect_instances.py +++ b/pype/plugins/fusion/publish/collect_instances.py @@ -76,8 +76,8 @@ class CollectInstances(pyblish.api.ContextPlugin): "outputDir": os.path.dirname(path), "ext": ext, # todo: should be redundant "label": label, - "families": ["colorbleed.saver"], - "family": "colorbleed.saver", + "families": ["saver"], + "family": "saver", "active": active, "publish": active # backwards compatibility }) diff --git a/pype/plugins/fusion/publish/collect_render_target.py b/pype/plugins/fusion/publish/collect_render_target.py index a9193eaee5..b6217f1ddf 100644 --- a/pype/plugins/fusion/publish/collect_render_target.py +++ b/pype/plugins/fusion/publish/collect_render_target.py @@ -13,7 +13,7 @@ class CollectFusionRenderMode(pyblish.api.InstancePlugin): available tool does not visualize which render mode is set for the current comp, please run the following line in the console (Py2) - comp.GetData("colorbleed.rendermode") + comp.GetData("pype.rendermode") This will return the name of the current render mode as seen above under Options. @@ -23,7 +23,7 @@ class CollectFusionRenderMode(pyblish.api.InstancePlugin): order = pyblish.api.CollectorOrder + 0.4 label = "Collect Render Mode" hosts = ["fusion"] - families = ["colorbleed.saver"] + families = ["saver"] def process(self, instance): """Collect all image sequence tools""" @@ -34,11 +34,11 @@ class CollectFusionRenderMode(pyblish.api.InstancePlugin): raise RuntimeError("No comp previously collected, unable to " "retrieve Fusion version.") - rendermode = comp.GetData("colorbleed.rendermode") or "renderlocal" + rendermode = comp.GetData("pype.rendermode") or "renderlocal" assert rendermode in options, "Must be supported render mode" self.log.info("Render mode: {0}".format(rendermode)) # Append family - family = "colorbleed.saver.{0}".format(rendermode) + family = "saver.{0}".format(rendermode) instance.data["families"].append(family) diff --git a/pype/plugins/fusion/publish/increment_current_file_deadline.py b/pype/plugins/fusion/publish/increment_current_file_deadline.py index 9d766c426c..6545d84da3 100644 --- a/pype/plugins/fusion/publish/increment_current_file_deadline.py +++ b/pype/plugins/fusion/publish/increment_current_file_deadline.py @@ -11,13 +11,13 @@ class FusionIncrementCurrentFile(pyblish.api.ContextPlugin): label = "Increment current file" order = pyblish.api.IntegratorOrder + 9.0 hosts = ["fusion"] - families = ["colorbleed.saver.deadline"] + families = ["saver.deadline"] optional = True def process(self, context): - from colorbleed.lib import version_up - from colorbleed.action import get_errored_plugins_from_data + from pype.lib import version_up + from pype.action import get_errored_plugins_from_data errored_plugins = get_errored_plugins_from_data(context) if any(plugin.__name__ == "FusionSubmitDeadline" diff --git a/pype/plugins/fusion/publish/publish_image_sequences.py b/pype/plugins/fusion/publish/publish_image_sequences.py index 33d6d2773d..26ae74676f 100644 --- a/pype/plugins/fusion/publish/publish_image_sequences.py +++ b/pype/plugins/fusion/publish/publish_image_sequences.py @@ -5,7 +5,7 @@ import subprocess import pyblish.api -from colorbleed.action import get_errored_plugins_from_data +from pype.action import get_errored_plugins_from_data def _get_script(): @@ -14,7 +14,7 @@ def _get_script(): # todo: use a more elegant way to get the python script try: - from colorbleed.scripts import publish_filesequence + from pype.scripts import publish_filesequence except Exception: raise RuntimeError("Expected module 'publish_imagesequence'" "to be available") @@ -32,7 +32,7 @@ class PublishImageSequence(pyblish.api.InstancePlugin): order = pyblish.api.IntegratorOrder label = "Publish Rendered Image Sequence(s)" hosts = ["fusion"] - families = ["colorbleed.saver.renderlocal"] + families = ["saver.renderlocal"] def process(self, instance): @@ -55,7 +55,7 @@ class PublishImageSequence(pyblish.api.InstancePlugin): "regex": regex, "startFrame": instance.context.data["startFrame"], "endFrame": instance.context.data["endFrame"], - "families": ["colorbleed.imagesequence"], + "families": ["imagesequence"], } # Write metadata and store the path in the instance diff --git a/pype/plugins/fusion/publish/render_local.py b/pype/plugins/fusion/publish/render_local.py index 39ce0d45dc..c97fe1a13d 100644 --- a/pype/plugins/fusion/publish/render_local.py +++ b/pype/plugins/fusion/publish/render_local.py @@ -14,7 +14,7 @@ class FusionRenderLocal(pyblish.api.InstancePlugin): order = pyblish.api.ExtractorOrder label = "Render Local" hosts = ["fusion"] - families = ["colorbleed.saver.renderlocal"] + families = ["saver.renderlocal"] def process(self, instance): diff --git a/pype/plugins/fusion/publish/save_scene.py b/pype/plugins/fusion/publish/save_scene.py index e88b8ba769..850ac5c372 100644 --- a/pype/plugins/fusion/publish/save_scene.py +++ b/pype/plugins/fusion/publish/save_scene.py @@ -7,7 +7,7 @@ class FusionSaveComp(pyblish.api.ContextPlugin): label = "Save current file" order = pyblish.api.ExtractorOrder - 0.49 hosts = ["fusion"] - families = ["colorbleed.saver"] + families = ["saver"] def process(self, context): diff --git a/pype/plugins/fusion/publish/submit_deadline.py b/pype/plugins/fusion/publish/submit_deadline.py index 9fbf9b4003..6e1f405afd 100644 --- a/pype/plugins/fusion/publish/submit_deadline.py +++ b/pype/plugins/fusion/publish/submit_deadline.py @@ -19,7 +19,7 @@ class FusionSubmitDeadline(pyblish.api.InstancePlugin): label = "Submit to Deadline" order = pyblish.api.IntegratorOrder hosts = ["fusion"] - families = ["colorbleed.saver.deadline"] + families = ["saver.deadline"] def process(self, instance): diff --git a/pype/plugins/fusion/publish/validate_background_depth.py b/pype/plugins/fusion/publish/validate_background_depth.py index abf5dd248e..88a52ad52d 100644 --- a/pype/plugins/fusion/publish/validate_background_depth.py +++ b/pype/plugins/fusion/publish/validate_background_depth.py @@ -1,6 +1,6 @@ import pyblish.api -from colorbleed import action +from pype import action class ValidateBackgroundDepth(pyblish.api.InstancePlugin): @@ -10,7 +10,7 @@ class ValidateBackgroundDepth(pyblish.api.InstancePlugin): label = "Validate Background Depth 32 bit" actions = [action.RepairAction] hosts = ["fusion"] - families = ["colorbleed.saver"] + families = ["saver"] optional = True @classmethod diff --git a/pype/plugins/fusion/publish/validate_comp_saved.py b/pype/plugins/fusion/publish/validate_comp_saved.py index 18621ceb4f..425168fbdf 100644 --- a/pype/plugins/fusion/publish/validate_comp_saved.py +++ b/pype/plugins/fusion/publish/validate_comp_saved.py @@ -8,7 +8,7 @@ class ValidateFusionCompSaved(pyblish.api.ContextPlugin): order = pyblish.api.ValidatorOrder label = "Validate Comp Saved" - families = ["colorbleed.saver"] + families = ["saver"] hosts = ["fusion"] def process(self, context): diff --git a/pype/plugins/fusion/publish/validate_create_folder_checked.py b/pype/plugins/fusion/publish/validate_create_folder_checked.py index 7a10b1e538..00a8526c6b 100644 --- a/pype/plugins/fusion/publish/validate_create_folder_checked.py +++ b/pype/plugins/fusion/publish/validate_create_folder_checked.py @@ -1,6 +1,6 @@ import pyblish.api -from colorbleed import action +from pype import action class ValidateCreateFolderChecked(pyblish.api.InstancePlugin): @@ -13,7 +13,7 @@ class ValidateCreateFolderChecked(pyblish.api.InstancePlugin): order = pyblish.api.ValidatorOrder actions = [action.RepairAction] label = "Validate Create Folder Checked" - families = ["colorbleed.saver"] + families = ["saver"] hosts = ["fusion"] @classmethod diff --git a/pype/plugins/fusion/publish/validate_filename_has_extension.py b/pype/plugins/fusion/publish/validate_filename_has_extension.py index b7fe1f4c31..d3762ad290 100644 --- a/pype/plugins/fusion/publish/validate_filename_has_extension.py +++ b/pype/plugins/fusion/publish/validate_filename_has_extension.py @@ -14,7 +14,7 @@ class ValidateFilenameHasExtension(pyblish.api.InstancePlugin): order = pyblish.api.ValidatorOrder label = "Validate Filename Has Extension" - families = ["colorbleed.saver"] + families = ["saver"] hosts = ["fusion"] def process(self, instance): diff --git a/pype/plugins/fusion/publish/validate_saver_has_input.py b/pype/plugins/fusion/publish/validate_saver_has_input.py index 27ed77d9d9..6887a9704c 100644 --- a/pype/plugins/fusion/publish/validate_saver_has_input.py +++ b/pype/plugins/fusion/publish/validate_saver_has_input.py @@ -10,7 +10,7 @@ class ValidateSaverHasInput(pyblish.api.InstancePlugin): order = pyblish.api.ValidatorOrder label = "Validate Saver Has Input" - families = ["colorbleed.saver"] + families = ["saver"] hosts = ["fusion"] @classmethod diff --git a/pype/plugins/fusion/publish/validate_saver_passthrough.py b/pype/plugins/fusion/publish/validate_saver_passthrough.py index ca58eba5bd..2da5cf2494 100644 --- a/pype/plugins/fusion/publish/validate_saver_passthrough.py +++ b/pype/plugins/fusion/publish/validate_saver_passthrough.py @@ -6,7 +6,7 @@ class ValidateSaverPassthrough(pyblish.api.ContextPlugin): order = pyblish.api.ValidatorOrder label = "Validate Saver Passthrough" - families = ["colorbleed.saver"] + families = ["saver"] hosts = ["fusion"] def process(self, context): diff --git a/pype/plugins/fusion/publish/validate_unique_subsets.py b/pype/plugins/fusion/publish/validate_unique_subsets.py index 527b4acc69..2000e1c05d 100644 --- a/pype/plugins/fusion/publish/validate_unique_subsets.py +++ b/pype/plugins/fusion/publish/validate_unique_subsets.py @@ -6,7 +6,7 @@ class ValidateUniqueSubsets(pyblish.api.InstancePlugin): order = pyblish.api.ValidatorOrder label = "Validate Unique Subsets" - families = ["colorbleed.saver"] + families = ["saver"] hosts = ["fusion"] @classmethod diff --git a/pype/plugins/global/load/open_imagesequence.py b/pype/plugins/global/load/open_imagesequence.py index 12fb9a0226..8cb16fc507 100644 --- a/pype/plugins/global/load/open_imagesequence.py +++ b/pype/plugins/global/load/open_imagesequence.py @@ -18,7 +18,7 @@ def open(filepath): class PlayImageSequence(api.Loader): """Open Image Sequence with system default""" - families = ["colorbleed.imagesequence"] + families = ["imagesequence"] representations = ["*"] label = "Play sequence" diff --git a/pype/plugins/global/publish/collect_deadline_user.py b/pype/plugins/global/publish/collect_deadline_user.py index f78d0b1c9d..624e455251 100644 --- a/pype/plugins/global/publish/collect_deadline_user.py +++ b/pype/plugins/global/publish/collect_deadline_user.py @@ -2,7 +2,7 @@ import os import subprocess import pyblish.api -from colorbleed.plugin import contextplugin_should_run +from pype.plugin import contextplugin_should_run CREATE_NO_WINDOW = 0x08000000 @@ -36,7 +36,7 @@ class CollectDeadlineUser(pyblish.api.ContextPlugin): order = pyblish.api.CollectorOrder + 0.499 label = "Deadline User" hosts = ['maya', 'fusion'] - families = ["colorbleed.renderlayer", "colorbleed.saver.deadline"] + families = ["renderlayer", "saver.deadline"] def process(self, context): """Inject the current working file""" diff --git a/pype/plugins/global/publish/collect_filesequences.py b/pype/plugins/global/publish/collect_filesequences.py index 9c2390d3dc..3dcf0fdea6 100644 --- a/pype/plugins/global/publish/collect_filesequences.py +++ b/pype/plugins/global/publish/collect_filesequences.py @@ -148,7 +148,7 @@ class CollectFileSequences(pyblish.api.ContextPlugin): raise RuntimeError("Invalid sequence") # Get family from the data - families = data.get("families", ["colorbleed.imagesequence"]) + families = data.get("families", ["imagesequence"]) assert isinstance(families, (list, tuple)), "Must be iterable" assert families, "Must have at least a single family" diff --git a/pype/plugins/global/publish/integrate.py b/pype/plugins/global/publish/integrate.py index 869291c91b..554de1fb08 100644 --- a/pype/plugins/global/publish/integrate.py +++ b/pype/plugins/global/publish/integrate.py @@ -23,20 +23,20 @@ class IntegrateAsset(pyblish.api.InstancePlugin): label = "Integrate Asset" order = pyblish.api.IntegratorOrder - families = ["colorbleed.animation", - "colorbleed.camera", - "colorbleed.fbx", - "colorbleed.imagesequence", - "colorbleed.look", - "colorbleed.mayaAscii", - "colorbleed.model", - "colorbleed.pointcache", - "colorbleed.vdbcache", - "colorbleed.setdress", - "colorbleed.rig", - "colorbleed.vrayproxy", - "colorbleed.yetiRig", - "colorbleed.yeticache"] + families = ["animation", + "camera", + "fbx", + "imagesequence", + "look", + "mayaAscii", + "model", + "pointcache", + "vdbcache", + "setdress", + "rig", + "vrayproxy", + "yetiRig", + "yeticache"] def process(self, instance): diff --git a/pype/plugins/global/publish/submit_publish_job.py b/pype/plugins/global/publish/submit_publish_job.py index 1806668433..762042dbed 100644 --- a/pype/plugins/global/publish/submit_publish_job.py +++ b/pype/plugins/global/publish/submit_publish_job.py @@ -12,7 +12,7 @@ import pyblish.api def _get_script(): """Get path to the image sequence script""" try: - from colorbleed.scripts import publish_filesequence + from pype.scripts import publish_filesequence except Exception as e: raise RuntimeError("Expected module 'publish_imagesequence'" "to be available") @@ -123,9 +123,9 @@ class SubmitDependentImageSequenceJobDeadline(pyblish.api.InstancePlugin): label = "Submit image sequence jobs to Deadline" order = pyblish.api.IntegratorOrder + 0.1 hosts = ["fusion", "maya"] - families = ["colorbleed.saver.deadline", - "colorbleed.renderlayer", - "colorbleed.vrayscene"] + families = ["saver.deadline", + "renderlayer", + "vrayscene"] def process(self, instance): @@ -175,7 +175,7 @@ class SubmitDependentImageSequenceJobDeadline(pyblish.api.InstancePlugin): "regex": regex, "startFrame": start, "endFrame": end, - "families": ["colorbleed.imagesequence"], + "families": ["imagesequence"], # Optional metadata (for debugging) "metadata": { @@ -193,7 +193,7 @@ class SubmitDependentImageSequenceJobDeadline(pyblish.api.InstancePlugin): resources = [] if data.get("extendFrames", False): - family = "colorbleed.imagesequence" + family = "imagesequence" override = data["overrideExistingFrame"] # override = data.get("overrideExistingFrame", False) diff --git a/pype/plugins/global/publish/validate_resources.py b/pype/plugins/global/publish/validate_resources.py index 2dc6f8c313..bc10d3003c 100644 --- a/pype/plugins/global/publish/validate_resources.py +++ b/pype/plugins/global/publish/validate_resources.py @@ -1,5 +1,5 @@ import pyblish.api -import colorbleed.api +import pype.api import os @@ -17,7 +17,7 @@ class ValidateResources(pyblish.api.InstancePlugin): """ - order = colorbleed.api.ValidateContentsOrder + order = pype.api.ValidateContentsOrder label = "Resources" def process(self, instance): diff --git a/pype/plugins/global/publish/validate_sequence_frames.py b/pype/plugins/global/publish/validate_sequence_frames.py index bd14b4c0c3..cd54e6becc 100644 --- a/pype/plugins/global/publish/validate_sequence_frames.py +++ b/pype/plugins/global/publish/validate_sequence_frames.py @@ -11,7 +11,7 @@ class ValidateSequenceFrames(pyblish.api.InstancePlugin): order = pyblish.api.ValidatorOrder label = "Validate Sequence Frames" - families = ["colorbleed.imagesequence"] + families = ["imagesequence"] hosts = ["shell"] def process(self, instance): diff --git a/pype/plugins/houdini/create/create_alembic_camera.py b/pype/plugins/houdini/create/create_alembic_camera.py index 96449fb3db..cf8ac41b62 100644 --- a/pype/plugins/houdini/create/create_alembic_camera.py +++ b/pype/plugins/houdini/create/create_alembic_camera.py @@ -6,7 +6,7 @@ class CreateAlembicCamera(houdini.Creator): name = "camera" label = "Camera (Abc)" - family = "colorbleed.camera" + family = "camera" icon = "camera" def __init__(self, *args, **kwargs): diff --git a/pype/plugins/houdini/create/create_pointcache.py b/pype/plugins/houdini/create/create_pointcache.py index 85993678c2..ae7e845083 100644 --- a/pype/plugins/houdini/create/create_pointcache.py +++ b/pype/plugins/houdini/create/create_pointcache.py @@ -6,7 +6,7 @@ class CreatePointCache(houdini.Creator): name = "pointcache" label = "Point Cache" - family = "colorbleed.pointcache" + family = "pointcache" icon = "gears" def __init__(self, *args, **kwargs): diff --git a/pype/plugins/houdini/create/create_vbd_cache.py b/pype/plugins/houdini/create/create_vbd_cache.py index ebdb1271ce..e862d5c96d 100644 --- a/pype/plugins/houdini/create/create_vbd_cache.py +++ b/pype/plugins/houdini/create/create_vbd_cache.py @@ -6,7 +6,7 @@ class CreateVDBCache(houdini.Creator): name = "vbdcache" label = "VDB Cache" - family = "colorbleed.vdbcache" + family = "vdbcache" icon = "cloud" def __init__(self, *args, **kwargs): diff --git a/pype/plugins/houdini/load/load_alembic.py b/pype/plugins/houdini/load/load_alembic.py index 690b15c736..8fc2b6a61a 100644 --- a/pype/plugins/houdini/load/load_alembic.py +++ b/pype/plugins/houdini/load/load_alembic.py @@ -6,9 +6,9 @@ from avalon.houdini import pipeline, lib class AbcLoader(api.Loader): """Specific loader of Alembic for the avalon.animation family""" - families = ["colorbleed.model", - "colorbleed.animation", - "colorbleed.pointcache"] + families = ["model", + "animation", + "pointcache"] label = "Load Alembic" representations = ["abc"] order = -10 diff --git a/pype/plugins/houdini/load/load_camera.py b/pype/plugins/houdini/load/load_camera.py index f827244c6b..a3d67f6e5e 100644 --- a/pype/plugins/houdini/load/load_camera.py +++ b/pype/plugins/houdini/load/load_camera.py @@ -6,7 +6,7 @@ from avalon.houdini import pipeline, lib class CameraLoader(api.Loader): """Specific loader of Alembic for the avalon.animation family""" - families = ["colorbleed.camera"] + families = ["camera"] label = "Load Camera (abc)" representations = ["abc"] order = -10 diff --git a/pype/plugins/houdini/publish/collect_frames.py b/pype/plugins/houdini/publish/collect_frames.py index 49fa7378c5..7735d23fb7 100644 --- a/pype/plugins/houdini/publish/collect_frames.py +++ b/pype/plugins/houdini/publish/collect_frames.py @@ -2,7 +2,7 @@ import os import re import pyblish.api -from colorbleed.houdini import lib +from pype.houdini import lib class CollectFrames(pyblish.api.InstancePlugin): @@ -10,7 +10,7 @@ class CollectFrames(pyblish.api.InstancePlugin): order = pyblish.api.CollectorOrder label = "Collect Frames" - families = ["colorbleed.vdbcache"] + families = ["vdbcache"] def process(self, instance): diff --git a/pype/plugins/houdini/publish/collect_output_node.py b/pype/plugins/houdini/publish/collect_output_node.py index d90898944f..c0587d5336 100644 --- a/pype/plugins/houdini/publish/collect_output_node.py +++ b/pype/plugins/houdini/publish/collect_output_node.py @@ -5,8 +5,8 @@ class CollectOutputSOPPath(pyblish.api.InstancePlugin): """Collect the out node's SOP Path value.""" order = pyblish.api.CollectorOrder - families = ["colorbleed.pointcache", - "colorbleed.vdbcache"] + families = ["pointcache", + "vdbcache"] hosts = ["houdini"] label = "Collect Output SOP Path" diff --git a/pype/plugins/houdini/publish/extract_alembic.py b/pype/plugins/houdini/publish/extract_alembic.py index 8872372484..f40f3d2d0e 100644 --- a/pype/plugins/houdini/publish/extract_alembic.py +++ b/pype/plugins/houdini/publish/extract_alembic.py @@ -1,15 +1,15 @@ import os import pyblish.api -import colorbleed.api +import pype.api -class ExtractAlembic(colorbleed.api.Extractor): +class ExtractAlembic(pype.api.Extractor): order = pyblish.api.ExtractorOrder label = "Extract Alembic" hosts = ["houdini"] - families = ["colorbleed.pointcache", "colorbleed.camera"] + families = ["pointcache", "camera"] def process(self, instance): diff --git a/pype/plugins/houdini/publish/extract_vdb_cache.py b/pype/plugins/houdini/publish/extract_vdb_cache.py index 7fe443b5a1..cfd9104744 100644 --- a/pype/plugins/houdini/publish/extract_vdb_cache.py +++ b/pype/plugins/houdini/publish/extract_vdb_cache.py @@ -1,14 +1,14 @@ import os import pyblish.api -import colorbleed.api +import pype.api -class ExtractVDBCache(colorbleed.api.Extractor): +class ExtractVDBCache(pype.api.Extractor): order = pyblish.api.ExtractorOrder + 0.1 label = "Extract VDB Cache" - families = ["colorbleed.vdbcache"] + families = ["vdbcache"] hosts = ["houdini"] def process(self, instance): diff --git a/pype/plugins/houdini/publish/validate_alembic_input_node.py b/pype/plugins/houdini/publish/validate_alembic_input_node.py index 663b1198eb..c68e3cdf5c 100644 --- a/pype/plugins/houdini/publish/validate_alembic_input_node.py +++ b/pype/plugins/houdini/publish/validate_alembic_input_node.py @@ -1,5 +1,5 @@ import pyblish.api -import colorbleed.api +import pype.api class ValidateAlembicInputNode(pyblish.api.InstancePlugin): @@ -11,8 +11,8 @@ class ValidateAlembicInputNode(pyblish.api.InstancePlugin): """ - order = colorbleed.api.ValidateContentsOrder + 0.1 - families = ["colorbleed.pointcache"] + order = pype.api.ValidateContentsOrder + 0.1 + families = ["pointcache"] hosts = ["houdini"] label = "Validate Input Node (Abc)" diff --git a/pype/plugins/houdini/publish/validate_animation_settings.py b/pype/plugins/houdini/publish/validate_animation_settings.py index 92955efbe8..238dfb4fa4 100644 --- a/pype/plugins/houdini/publish/validate_animation_settings.py +++ b/pype/plugins/houdini/publish/validate_animation_settings.py @@ -1,6 +1,6 @@ import pyblish.api -from colorbleed.houdini import lib +from pype.houdini import lib class ValidateAnimationSettings(pyblish.api.InstancePlugin): @@ -23,7 +23,7 @@ class ValidateAnimationSettings(pyblish.api.InstancePlugin): order = pyblish.api.ValidatorOrder label = "Validate Frame Settings" - families = ["colorbleed.vdbcache"] + families = ["vdbcache"] def process(self, instance): diff --git a/pype/plugins/houdini/publish/validate_bypass.py b/pype/plugins/houdini/publish/validate_bypass.py index 9af8a2b9ae..70505f0731 100644 --- a/pype/plugins/houdini/publish/validate_bypass.py +++ b/pype/plugins/houdini/publish/validate_bypass.py @@ -1,5 +1,5 @@ import pyblish.api -import colorbleed.api +import pype.api class ValidateBypassed(pyblish.api.InstancePlugin): @@ -11,7 +11,7 @@ class ValidateBypassed(pyblish.api.InstancePlugin): """ - order = colorbleed.api.ValidateContentsOrder - 0.1 + order = pype.api.ValidateContentsOrder - 0.1 families = ["*"] hosts = ["houdini"] label = "Validate ROP Bypass" diff --git a/pype/plugins/houdini/publish/validate_camera_rop.py b/pype/plugins/houdini/publish/validate_camera_rop.py index 83f4dd5a57..48335cfb37 100644 --- a/pype/plugins/houdini/publish/validate_camera_rop.py +++ b/pype/plugins/houdini/publish/validate_camera_rop.py @@ -1,12 +1,12 @@ import pyblish.api -import colorbleed.api +import pype.api class ValidateCameraROP(pyblish.api.InstancePlugin): """Validate Camera ROP settings.""" - order = colorbleed.api.ValidateContentsOrder - families = ['colorbleed.camera'] + order = pype.api.ValidateContentsOrder + families = ['camera'] hosts = ['houdini'] label = 'Camera ROP' diff --git a/pype/plugins/houdini/publish/validate_mkpaths_toggled.py b/pype/plugins/houdini/publish/validate_mkpaths_toggled.py index 826dedf933..21f50d7166 100644 --- a/pype/plugins/houdini/publish/validate_mkpaths_toggled.py +++ b/pype/plugins/houdini/publish/validate_mkpaths_toggled.py @@ -1,14 +1,14 @@ import pyblish.api -import colorbleed.api +import pype.api class ValidateIntermediateDirectoriesChecked(pyblish.api.InstancePlugin): """Validate Create Intermediate Directories is enabled on ROP node.""" - order = colorbleed.api.ValidateContentsOrder - families = ['colorbleed.pointcache', - 'colorbleed.camera', - 'colorbleed.vdbcache'] + order = pype.api.ValidateContentsOrder + families = ['pointcache', + 'camera', + 'vdbcache'] hosts = ['houdini'] label = 'Create Intermediate Directories Checked' diff --git a/pype/plugins/houdini/publish/validate_output_node.py b/pype/plugins/houdini/publish/validate_output_node.py index 4b140f63df..5e20ee40d6 100644 --- a/pype/plugins/houdini/publish/validate_output_node.py +++ b/pype/plugins/houdini/publish/validate_output_node.py @@ -14,8 +14,8 @@ class ValidateOutputNode(pyblish.api.InstancePlugin): """ order = pyblish.api.ValidatorOrder - families = ["colorbleed.pointcache", - "colorbleed.vdbcache"] + families = ["pointcache", + "vdbcache"] hosts = ["houdini"] label = "Validate Output Node" diff --git a/pype/plugins/houdini/publish/validate_primitive_hierarchy_paths.py b/pype/plugins/houdini/publish/validate_primitive_hierarchy_paths.py index ab91970b20..70e7873d3b 100644 --- a/pype/plugins/houdini/publish/validate_primitive_hierarchy_paths.py +++ b/pype/plugins/houdini/publish/validate_primitive_hierarchy_paths.py @@ -1,5 +1,5 @@ import pyblish.api -import colorbleed.api +import pype.api class ValidatePrimitiveHierarchyPaths(pyblish.api.InstancePlugin): @@ -11,8 +11,8 @@ class ValidatePrimitiveHierarchyPaths(pyblish.api.InstancePlugin): """ - order = colorbleed.api.ValidateContentsOrder + 0.1 - families = ["colorbleed.pointcache"] + order = pype.api.ValidateContentsOrder + 0.1 + families = ["pointcache"] hosts = ["houdini"] label = "Validate Prims Hierarchy Path" diff --git a/pype/plugins/houdini/publish/validate_vdb_input_node.py b/pype/plugins/houdini/publish/validate_vdb_input_node.py index 24606046fa..e5bc118306 100644 --- a/pype/plugins/houdini/publish/validate_vdb_input_node.py +++ b/pype/plugins/houdini/publish/validate_vdb_input_node.py @@ -1,5 +1,5 @@ import pyblish.api -import colorbleed.api +import pype.api class ValidateVDBInputNode(pyblish.api.InstancePlugin): @@ -16,8 +16,8 @@ class ValidateVDBInputNode(pyblish.api.InstancePlugin): """ - order = colorbleed.api.ValidateContentsOrder + 0.1 - families = ["colorbleed.vdbcache"] + order = pype.api.ValidateContentsOrder + 0.1 + families = ["vdbcache"] hosts = ["houdini"] label = "Validate Input Node (VDB)" diff --git a/pype/plugins/maya/create/colorbleed_animation.py b/pype/plugins/maya/create/colorbleed_animation.py index 16f321ee68..5eef2ac225 100644 --- a/pype/plugins/maya/create/colorbleed_animation.py +++ b/pype/plugins/maya/create/colorbleed_animation.py @@ -1,5 +1,5 @@ import avalon.maya -from colorbleed.maya import lib +from pype.maya import lib class CreateAnimation(avalon.maya.Creator): @@ -7,7 +7,7 @@ class CreateAnimation(avalon.maya.Creator): name = "animationDefault" label = "Animation" - family = "colorbleed.animation" + family = "animation" icon = "male" def __init__(self, *args, **kwargs): diff --git a/pype/plugins/maya/create/colorbleed_camera.py b/pype/plugins/maya/create/colorbleed_camera.py index f38d8e0d43..e472c2c2c6 100644 --- a/pype/plugins/maya/create/colorbleed_camera.py +++ b/pype/plugins/maya/create/colorbleed_camera.py @@ -1,5 +1,5 @@ import avalon.maya -from colorbleed.maya import lib +from pype.maya import lib class CreateCamera(avalon.maya.Creator): @@ -7,7 +7,7 @@ class CreateCamera(avalon.maya.Creator): name = "cameraDefault" label = "Camera" - family = "colorbleed.camera" + family = "camera" icon = "video-camera" def __init__(self, *args, **kwargs): diff --git a/pype/plugins/maya/create/colorbleed_fbx.py b/pype/plugins/maya/create/colorbleed_fbx.py index e6b57fa86f..a04d47c37d 100644 --- a/pype/plugins/maya/create/colorbleed_fbx.py +++ b/pype/plugins/maya/create/colorbleed_fbx.py @@ -1,5 +1,5 @@ import avalon.maya -from colorbleed.maya import lib +from pype.maya import lib class CreateFBX(avalon.maya.Creator): @@ -7,7 +7,7 @@ class CreateFBX(avalon.maya.Creator): name = "fbxDefault" label = "FBX" - family = "colorbleed.fbx" + family = "fbx" icon = "plug" def __init__(self, *args, **kwargs): diff --git a/pype/plugins/maya/create/colorbleed_look.py b/pype/plugins/maya/create/colorbleed_look.py index 011fdd4f92..23e4f034b2 100644 --- a/pype/plugins/maya/create/colorbleed_look.py +++ b/pype/plugins/maya/create/colorbleed_look.py @@ -1,5 +1,5 @@ import avalon.maya -from colorbleed.maya import lib +from pype.maya import lib class CreateLook(avalon.maya.Creator): @@ -7,7 +7,7 @@ class CreateLook(avalon.maya.Creator): name = "look" label = "Look" - family = "colorbleed.look" + family = "look" icon = "paint-brush" def __init__(self, *args, **kwargs): diff --git a/pype/plugins/maya/create/colorbleed_mayaascii.py b/pype/plugins/maya/create/colorbleed_mayaascii.py index d8cc9f9897..bf55c3d578 100644 --- a/pype/plugins/maya/create/colorbleed_mayaascii.py +++ b/pype/plugins/maya/create/colorbleed_mayaascii.py @@ -6,5 +6,5 @@ class CreateMayaAscii(avalon.maya.Creator): name = "mayaAscii" label = "Maya Ascii" - family = "colorbleed.mayaAscii" + family = "mayaAscii" icon = "file-archive-o" diff --git a/pype/plugins/maya/create/colorbleed_model.py b/pype/plugins/maya/create/colorbleed_model.py index 956f9f0e4f..449a5642be 100644 --- a/pype/plugins/maya/create/colorbleed_model.py +++ b/pype/plugins/maya/create/colorbleed_model.py @@ -6,7 +6,7 @@ class CreateModel(avalon.maya.Creator): name = "modelDefault" label = "Model" - family = "colorbleed.model" + family = "model" icon = "cube" def __init__(self, *args, **kwargs): diff --git a/pype/plugins/maya/create/colorbleed_pointcache.py b/pype/plugins/maya/create/colorbleed_pointcache.py index 2738ff6ddf..e5c82f7e10 100644 --- a/pype/plugins/maya/create/colorbleed_pointcache.py +++ b/pype/plugins/maya/create/colorbleed_pointcache.py @@ -1,5 +1,5 @@ import avalon.maya -from colorbleed.maya import lib +from pype.maya import lib class CreatePointCache(avalon.maya.Creator): @@ -7,7 +7,7 @@ class CreatePointCache(avalon.maya.Creator): name = "pointcache" label = "Point Cache" - family = "colorbleed.pointcache" + family = "pointcache" icon = "gears" def __init__(self, *args, **kwargs): diff --git a/pype/plugins/maya/create/colorbleed_renderglobals.py b/pype/plugins/maya/create/colorbleed_renderglobals.py index 9fc3e0ceab..6a8c6d3c72 100644 --- a/pype/plugins/maya/create/colorbleed_renderglobals.py +++ b/pype/plugins/maya/create/colorbleed_renderglobals.py @@ -1,6 +1,6 @@ from maya import cmds -import colorbleed.maya.lib as lib +import pype.maya.lib as lib from avalon.vendor import requests import avalon.maya @@ -10,7 +10,7 @@ from avalon import api class CreateRenderGlobals(avalon.maya.Creator): label = "Render Globals" - family = "colorbleed.renderglobals" + family = "renderglobals" icon = "gears" def __init__(self, *args, **kwargs): diff --git a/pype/plugins/maya/create/colorbleed_rig.py b/pype/plugins/maya/create/colorbleed_rig.py index 1212abb6ce..2c8f3d78b9 100644 --- a/pype/plugins/maya/create/colorbleed_rig.py +++ b/pype/plugins/maya/create/colorbleed_rig.py @@ -1,6 +1,6 @@ from maya import cmds -import colorbleed.maya.lib as lib +import pype.maya.lib as lib import avalon.maya @@ -9,7 +9,7 @@ class CreateRig(avalon.maya.Creator): name = "rigDefault" label = "Rig" - family = "colorbleed.rig" + family = "rig" icon = "wheelchair" def process(self): diff --git a/pype/plugins/maya/create/colorbleed_setdress.py b/pype/plugins/maya/create/colorbleed_setdress.py index 47089bea21..79f08ca04c 100644 --- a/pype/plugins/maya/create/colorbleed_setdress.py +++ b/pype/plugins/maya/create/colorbleed_setdress.py @@ -6,5 +6,5 @@ class CreateSetDress(avalon.maya.Creator): name = "setdress" label = "Set Dress" - family = "colorbleed.setdress" + family = "setdress" icon = "cubes" \ No newline at end of file diff --git a/pype/plugins/maya/create/colorbleed_vrayproxy.py b/pype/plugins/maya/create/colorbleed_vrayproxy.py index e866a1d092..704e72f04c 100644 --- a/pype/plugins/maya/create/colorbleed_vrayproxy.py +++ b/pype/plugins/maya/create/colorbleed_vrayproxy.py @@ -6,7 +6,7 @@ class CreateVrayProxy(avalon.maya.Creator): name = "vrayproxy" label = "VRay Proxy" - family = "colorbleed.vrayproxy" + family = "vrayproxy" icon = "gears" def __init__(self, *args, **kwargs): diff --git a/pype/plugins/maya/create/colorbleed_vrayscene.py b/pype/plugins/maya/create/colorbleed_vrayscene.py index 82f1b11682..df1c232858 100644 --- a/pype/plugins/maya/create/colorbleed_vrayscene.py +++ b/pype/plugins/maya/create/colorbleed_vrayscene.py @@ -4,7 +4,7 @@ import avalon.maya class CreateVRayScene(avalon.maya.Creator): label = "VRay Scene" - family = "colorbleed.vrayscene" + family = "vrayscene" icon = "cubes" def __init__(self, *args, **kwargs): diff --git a/pype/plugins/maya/create/colorbleed_yeti_cache.py b/pype/plugins/maya/create/colorbleed_yeti_cache.py index 2430821f5f..aaa94ce01d 100644 --- a/pype/plugins/maya/create/colorbleed_yeti_cache.py +++ b/pype/plugins/maya/create/colorbleed_yeti_cache.py @@ -1,7 +1,7 @@ from collections import OrderedDict import avalon.maya -from colorbleed.maya import lib +from pype.maya import lib class CreateYetiCache(avalon.maya.Creator): @@ -9,7 +9,7 @@ class CreateYetiCache(avalon.maya.Creator): name = "yetiDefault" label = "Yeti Cache" - family = "colorbleed.yeticache" + family = "yeticache" icon = "pagelines" def __init__(self, *args, **kwargs): diff --git a/pype/plugins/maya/create/colorbleed_yeti_rig.py b/pype/plugins/maya/create/colorbleed_yeti_rig.py index 55051100ad..c061084dd7 100644 --- a/pype/plugins/maya/create/colorbleed_yeti_rig.py +++ b/pype/plugins/maya/create/colorbleed_yeti_rig.py @@ -1,6 +1,6 @@ from maya import cmds -import colorbleed.maya.lib as lib +import pype.maya.lib as lib import avalon.maya @@ -8,7 +8,7 @@ class CreateYetiRig(avalon.maya.Creator): """Output for procedural plugin nodes ( Yeti / XGen / etc)""" label = "Yeti Rig" - family = "colorbleed.yetiRig" + family = "yetiRig" icon = "usb" def process(self): diff --git a/pype/plugins/maya/load/actions.py b/pype/plugins/maya/load/actions.py index 440fabf124..6db3c6ba34 100644 --- a/pype/plugins/maya/load/actions.py +++ b/pype/plugins/maya/load/actions.py @@ -8,9 +8,9 @@ from avalon import api class SetFrameRangeLoader(api.Loader): """Specific loader of Alembic for the avalon.animation family""" - families = ["colorbleed.animation", - "colorbleed.camera", - "colorbleed.pointcache"] + families = ["animation", + "camera", + "pointcache"] representations = ["abc"] label = "Set frame range" @@ -42,9 +42,9 @@ class SetFrameRangeLoader(api.Loader): class SetFrameRangeWithHandlesLoader(api.Loader): """Specific loader of Alembic for the avalon.animation family""" - families = ["colorbleed.animation", - "colorbleed.camera", - "colorbleed.pointcache"] + families = ["animation", + "camera", + "pointcache"] representations = ["abc"] label = "Set frame range (with handles)" diff --git a/pype/plugins/maya/load/load_alembic.py b/pype/plugins/maya/load/load_alembic.py index d34530a8d5..9e08702521 100644 --- a/pype/plugins/maya/load/load_alembic.py +++ b/pype/plugins/maya/load/load_alembic.py @@ -1,11 +1,11 @@ -import colorbleed.maya.plugin +import pype.maya.plugin -class AbcLoader(colorbleed.maya.plugin.ReferenceLoader): - """Specific loader of Alembic for the colorbleed.animation family""" +class AbcLoader(pype.maya.plugin.ReferenceLoader): + """Specific loader of Alembic for the pype.animation family""" - families = ["colorbleed.animation", - "colorbleed.pointcache"] + families = ["animation", + "pointcache"] label = "Reference animation" representations = ["abc"] order = -10 diff --git a/pype/plugins/maya/load/load_camera.py b/pype/plugins/maya/load/load_camera.py index 067c4c0cde..eb75c3a63d 100644 --- a/pype/plugins/maya/load/load_camera.py +++ b/pype/plugins/maya/load/load_camera.py @@ -1,10 +1,10 @@ -import colorbleed.maya.plugin +import pype.maya.plugin -class CameraLoader(colorbleed.maya.plugin.ReferenceLoader): - """Specific loader of Alembic for the colorbleed.camera family""" +class CameraLoader(pype.maya.plugin.ReferenceLoader): + """Specific loader of Alembic for the pype.camera family""" - families = ["colorbleed.camera"] + families = ["camera"] label = "Reference camera" representations = ["abc", "ma"] order = -10 diff --git a/pype/plugins/maya/load/load_fbx.py b/pype/plugins/maya/load/load_fbx.py index 0dade5eca2..2ee3e5fdbd 100644 --- a/pype/plugins/maya/load/load_fbx.py +++ b/pype/plugins/maya/load/load_fbx.py @@ -1,10 +1,10 @@ -import colorbleed.maya.plugin +import pype.maya.plugin -class FBXLoader(colorbleed.maya.plugin.ReferenceLoader): +class FBXLoader(pype.maya.plugin.ReferenceLoader): """Load the FBX""" - families = ["colorbleed.fbx"] + families = ["fbx"] representations = ["fbx"] label = "Reference FBX" diff --git a/pype/plugins/maya/load/load_look.py b/pype/plugins/maya/load/load_look.py index cc13918ba1..eede195a49 100644 --- a/pype/plugins/maya/load/load_look.py +++ b/pype/plugins/maya/load/load_look.py @@ -1,10 +1,10 @@ -import colorbleed.maya.plugin +import pype.maya.plugin -class LookLoader(colorbleed.maya.plugin.ReferenceLoader): +class LookLoader(pype.maya.plugin.ReferenceLoader): """Specific loader for lookdev""" - families = ["colorbleed.look"] + families = ["look"] representations = ["ma"] label = "Reference look" diff --git a/pype/plugins/maya/load/load_mayaascii.py b/pype/plugins/maya/load/load_mayaascii.py index dd86cc97b5..283ecbd3a2 100644 --- a/pype/plugins/maya/load/load_mayaascii.py +++ b/pype/plugins/maya/load/load_mayaascii.py @@ -1,10 +1,10 @@ -import colorbleed.maya.plugin +import pype.maya.plugin -class MayaAsciiLoader(colorbleed.maya.plugin.ReferenceLoader): +class MayaAsciiLoader(pype.maya.plugin.ReferenceLoader): """Load the model""" - families = ["colorbleed.mayaAscii"] + families = ["mayaAscii"] representations = ["ma"] label = "Reference Maya Ascii" diff --git a/pype/plugins/maya/load/load_model.py b/pype/plugins/maya/load/load_model.py index 0d08c6ecbd..145a1a3e00 100644 --- a/pype/plugins/maya/load/load_model.py +++ b/pype/plugins/maya/load/load_model.py @@ -1,11 +1,11 @@ from avalon import api -import colorbleed.maya.plugin +import pype.maya.plugin -class ModelLoader(colorbleed.maya.plugin.ReferenceLoader): +class ModelLoader(pype.maya.plugin.ReferenceLoader): """Load the model""" - families = ["colorbleed.model"] + families = ["model"] representations = ["ma"] label = "Reference Model" @@ -37,7 +37,7 @@ class ModelLoader(colorbleed.maya.plugin.ReferenceLoader): class GpuCacheLoader(api.Loader): """Load model Alembic as gpuCache""" - families = ["colorbleed.model"] + families = ["model"] representations = ["abc"] label = "Import Gpu Cache" diff --git a/pype/plugins/maya/load/load_rig.py b/pype/plugins/maya/load/load_rig.py index 1f3e83f60d..aa40ca3cc2 100644 --- a/pype/plugins/maya/load/load_rig.py +++ b/pype/plugins/maya/load/load_rig.py @@ -1,17 +1,17 @@ from maya import cmds -import colorbleed.maya.plugin +import pype.maya.plugin from avalon import api, maya -class RigLoader(colorbleed.maya.plugin.ReferenceLoader): +class RigLoader(pype.maya.plugin.ReferenceLoader): """Specific loader for rigs This automatically creates an instance for animators upon load. """ - families = ["colorbleed.rig"] + families = ["rig"] representations = ["ma"] label = "Reference rig" @@ -62,7 +62,7 @@ class RigLoader(colorbleed.maya.plugin.ReferenceLoader): cmds.select([output, controls] + roots, noExpand=True) api.create(name=namespace, asset=asset, - family="colorbleed.animation", + family="animation", options={"useSelection": True}, data={"dependencies": dependency}) diff --git a/pype/plugins/maya/load/load_setdress.py b/pype/plugins/maya/load/load_setdress.py index 8cc857fc3f..40785613be 100644 --- a/pype/plugins/maya/load/load_setdress.py +++ b/pype/plugins/maya/load/load_setdress.py @@ -3,7 +3,7 @@ from avalon import api class SetDressLoader(api.Loader): - families = ["colorbleed.setdress"] + families = ["setdress"] representations = ["json"] label = "Load Set Dress" @@ -23,7 +23,7 @@ class SetDressLoader(api.Loader): suffix="_", ) - from colorbleed import setdress_api + from pype import setdress_api containers = setdress_api.load_package(filepath=self.fname, name=name, @@ -45,7 +45,7 @@ class SetDressLoader(api.Loader): def update(self, container, representation): - from colorbleed import setdress_api + from pype import setdress_api return setdress_api.update_package(container, representation) @@ -53,7 +53,7 @@ class SetDressLoader(api.Loader): """Remove all sub containers""" from avalon import api - from colorbleed import setdress_api + from pype import setdress_api import maya.cmds as cmds # Remove all members diff --git a/pype/plugins/maya/load/load_vdb_to_redshift.py b/pype/plugins/maya/load/load_vdb_to_redshift.py index bafb529bda..8ff8bc0326 100644 --- a/pype/plugins/maya/load/load_vdb_to_redshift.py +++ b/pype/plugins/maya/load/load_vdb_to_redshift.py @@ -4,7 +4,7 @@ from avalon import api class LoadVDBtoRedShift(api.Loader): """Load OpenVDB in a Redshift Volume Shape""" - families = ["colorbleed.vdbcache"] + families = ["vdbcache"] representations = ["vdb"] label = "Load VDB to RedShift" diff --git a/pype/plugins/maya/load/load_vdb_to_vray.py b/pype/plugins/maya/load/load_vdb_to_vray.py index 5d868174ce..ac20b0eb43 100644 --- a/pype/plugins/maya/load/load_vdb_to_vray.py +++ b/pype/plugins/maya/load/load_vdb_to_vray.py @@ -3,7 +3,7 @@ from avalon import api class LoadVDBtoVRay(api.Loader): - families = ["colorbleed.vdbcache"] + families = ["vdbcache"] representations = ["vdb"] label = "Load VDB to VRay" diff --git a/pype/plugins/maya/load/load_vrayproxy.py b/pype/plugins/maya/load/load_vrayproxy.py index 6bf9bdb484..9396e124ce 100644 --- a/pype/plugins/maya/load/load_vrayproxy.py +++ b/pype/plugins/maya/load/load_vrayproxy.py @@ -7,7 +7,7 @@ import maya.cmds as cmds class VRayProxyLoader(api.Loader): """Load VRayMesh proxy""" - families = ["colorbleed.vrayproxy"] + families = ["vrayproxy"] representations = ["vrmesh"] label = "Import VRay Proxy" @@ -18,7 +18,7 @@ class VRayProxyLoader(api.Loader): def load(self, context, name, namespace, data): from avalon.maya.pipeline import containerise - from colorbleed.maya.lib import namespaced + from pype.maya.lib import namespaced asset_name = context['asset']["name"] namespace = namespace or lib.unique_namespace( diff --git a/pype/plugins/maya/load/load_yeti_cache.py b/pype/plugins/maya/load/load_yeti_cache.py index 5a1e404975..2160924047 100644 --- a/pype/plugins/maya/load/load_yeti_cache.py +++ b/pype/plugins/maya/load/load_yeti_cache.py @@ -8,12 +8,12 @@ from maya import cmds from avalon import api from avalon.maya import lib as avalon_lib, pipeline -from colorbleed.maya import lib +from pype.maya import lib class YetiCacheLoader(api.Loader): - families = ["colorbleed.yeticache", "colorbleed.yetiRig"] + families = ["yeticache", "yetiRig"] representations = ["fur"] label = "Load Yeti Cache" diff --git a/pype/plugins/maya/load/load_yeti_rig.py b/pype/plugins/maya/load/load_yeti_rig.py index 5043b1cbe0..096b936b41 100644 --- a/pype/plugins/maya/load/load_yeti_rig.py +++ b/pype/plugins/maya/load/load_yeti_rig.py @@ -1,9 +1,9 @@ -import colorbleed.maya.plugin +import pype.maya.plugin -class YetiRigLoader(colorbleed.maya.plugin.ReferenceLoader): +class YetiRigLoader(pype.maya.plugin.ReferenceLoader): - families = ["colorbleed.yetiRig"] + families = ["yetiRig"] representations = ["ma"] label = "Load Yeti Rig" diff --git a/pype/plugins/maya/publish/collect_animation.py b/pype/plugins/maya/publish/collect_animation.py index c724759180..349fa8e649 100644 --- a/pype/plugins/maya/publish/collect_animation.py +++ b/pype/plugins/maya/publish/collect_animation.py @@ -16,7 +16,7 @@ class CollectAnimationOutputGeometry(pyblish.api.InstancePlugin): """ order = pyblish.api.CollectorOrder + 0.4 - families = ["colorbleed.animation"] + families = ["animation"] label = "Collect Animation Output Geometry" hosts = ["maya"] diff --git a/pype/plugins/maya/publish/collect_history.py b/pype/plugins/maya/publish/collect_history.py index 840e916133..16c8e4342e 100644 --- a/pype/plugins/maya/publish/collect_history.py +++ b/pype/plugins/maya/publish/collect_history.py @@ -17,7 +17,7 @@ class CollectMayaHistory(pyblish.api.InstancePlugin): order = pyblish.api.CollectorOrder + 0.1 hosts = ["maya"] label = "Maya History" - families = ["colorbleed.rig"] + families = ["rig"] verbose = False def process(self, instance): diff --git a/pype/plugins/maya/publish/collect_instances.py b/pype/plugins/maya/publish/collect_instances.py index 6ca3f26da7..48f4889a51 100644 --- a/pype/plugins/maya/publish/collect_instances.py +++ b/pype/plugins/maya/publish/collect_instances.py @@ -19,7 +19,7 @@ class CollectInstances(pyblish.api.ContextPlugin): be able to achieve and the amount of data available to validators. An additional collector could also append this input data into the instance, as we do - for `colorbleed.rig` with collect_history. + for `pype.rig` with collect_history. """ diff --git a/pype/plugins/maya/publish/collect_look.py b/pype/plugins/maya/publish/collect_look.py index 1decca6e2e..cbfecdc0ad 100644 --- a/pype/plugins/maya/publish/collect_look.py +++ b/pype/plugins/maya/publish/collect_look.py @@ -4,7 +4,7 @@ import glob from maya import cmds import pyblish.api -import colorbleed.maya.lib as lib +import pype.maya.lib as lib SHAPE_ATTRS = ["castsShadows", "receiveShadows", @@ -203,7 +203,7 @@ class CollectLook(pyblish.api.InstancePlugin): """ order = pyblish.api.CollectorOrder + 0.4 - families = ["colorbleed.look"] + families = ["look"] label = "Collect Look" hosts = ["maya"] diff --git a/pype/plugins/maya/publish/collect_model.py b/pype/plugins/maya/publish/collect_model.py index cd780acc7f..403500ff97 100644 --- a/pype/plugins/maya/publish/collect_model.py +++ b/pype/plugins/maya/publish/collect_model.py @@ -9,7 +9,7 @@ class CollectModelData(pyblish.api.InstancePlugin): Ensures always only a single frame is extracted (current frame). Note: - This is a workaround so that the `colorbleed.model` family can use the + This is a workaround so that the `pype.model` family can use the same pointcache extractor implementation as animation and pointcaches. This always enforces the "current" frame to be published. @@ -17,7 +17,7 @@ class CollectModelData(pyblish.api.InstancePlugin): order = pyblish.api.CollectorOrder + 0.499 label = 'Collect Model Data' - families = ["colorbleed.model"] + families = ["model"] def process(self, instance): # Extract only current frame (override) diff --git a/pype/plugins/maya/publish/collect_render_layer_aovs.py b/pype/plugins/maya/publish/collect_render_layer_aovs.py index e2153e0ee0..d8d2995515 100644 --- a/pype/plugins/maya/publish/collect_render_layer_aovs.py +++ b/pype/plugins/maya/publish/collect_render_layer_aovs.py @@ -2,7 +2,7 @@ from maya import cmds import pyblish.api -import colorbleed.maya.lib as lib +import pype.maya.lib as lib class CollectRenderLayerAOVS(pyblish.api.InstancePlugin): @@ -27,7 +27,7 @@ class CollectRenderLayerAOVS(pyblish.api.InstancePlugin): order = pyblish.api.CollectorOrder + 0.01 label = "Render Elements / AOVs" hosts = ["maya"] - families = ["colorbleed.renderlayer"] + families = ["renderlayer"] def process(self, instance): diff --git a/pype/plugins/maya/publish/collect_renderable_camera.py b/pype/plugins/maya/publish/collect_renderable_camera.py index 8cf33bd73a..9bfc010204 100644 --- a/pype/plugins/maya/publish/collect_renderable_camera.py +++ b/pype/plugins/maya/publish/collect_renderable_camera.py @@ -2,7 +2,7 @@ import pyblish.api from maya import cmds -from colorbleed.maya import lib +from pype.maya import lib class CollectRenderableCamera(pyblish.api.InstancePlugin): @@ -11,8 +11,8 @@ class CollectRenderableCamera(pyblish.api.InstancePlugin): order = pyblish.api.CollectorOrder + 0.01 label = "Collect Renderable Camera(s)" hosts = ["maya"] - families = ["colorbleed.vrayscene", - "colorbleed.renderlayer"] + families = ["vrayscene", + "renderlayer"] def process(self, instance): layer = instance.data["setMembers"] diff --git a/pype/plugins/maya/publish/collect_renderlayers.py b/pype/plugins/maya/publish/collect_renderlayers.py index 369b21de02..c926baf803 100644 --- a/pype/plugins/maya/publish/collect_renderlayers.py +++ b/pype/plugins/maya/publish/collect_renderlayers.py @@ -3,7 +3,7 @@ from maya import cmds import pyblish.api from avalon import maya, api -import colorbleed.maya.lib as lib +import pype.maya.lib as lib class CollectMayaRenderlayers(pyblish.api.ContextPlugin): @@ -72,7 +72,7 @@ class CollectMayaRenderlayers(pyblish.api.ContextPlugin): # instance subset "family": "Render Layers", - "families": ["colorbleed.renderlayer"], + "families": ["renderlayer"], "asset": asset, "time": api.time(), "author": context.data["user"], diff --git a/pype/plugins/maya/publish/collect_setdress.py b/pype/plugins/maya/publish/collect_setdress.py index e5bddac887..bb56163293 100644 --- a/pype/plugins/maya/publish/collect_setdress.py +++ b/pype/plugins/maya/publish/collect_setdress.py @@ -3,7 +3,7 @@ import pyblish.api from maya import cmds, mel from avalon import maya as avalon -from colorbleed.maya import lib +from pype.maya import lib # TODO : Publish of setdress: -unique namespace for all assets, VALIDATOR! @@ -25,7 +25,7 @@ class CollectSetDress(pyblish.api.InstancePlugin): order = pyblish.api.CollectorOrder + 0.49 label = "Set Dress" - families = ["colorbleed.setdress"] + families = ["setdress"] def process(self, instance): diff --git a/pype/plugins/maya/publish/collect_vray_scene.py b/pype/plugins/maya/publish/collect_vray_scene.py index e4a9c42364..89c0aa8670 100644 --- a/pype/plugins/maya/publish/collect_vray_scene.py +++ b/pype/plugins/maya/publish/collect_vray_scene.py @@ -27,10 +27,10 @@ class CollectVRayScene(pyblish.api.ContextPlugin): work_dir = context.data["workspaceDir"] # Get VRay Scene instance - vray_scenes = host.lsattr("family", "colorbleed.vrayscene") + vray_scenes = host.lsattr("family", "vrayscene") if not vray_scenes: self.log.info("Skipping vrayScene collection, no " - "colorbleed.vrayscene instance found..") + "vrayscene instance found..") return assert len(vray_scenes) == 1, "Multiple vrayscene instances found!" @@ -90,7 +90,7 @@ class CollectVRayScene(pyblish.api.ContextPlugin): # instance subset "family": "VRay Scene", - "families": ["colorbleed.vrayscene"], + "families": ["vrayscene"], "asset": asset, "time": api.time(), "author": context.data["user"], diff --git a/pype/plugins/maya/publish/collect_yeti_cache.py b/pype/plugins/maya/publish/collect_yeti_cache.py index 550c780797..2365162c05 100644 --- a/pype/plugins/maya/publish/collect_yeti_cache.py +++ b/pype/plugins/maya/publish/collect_yeti_cache.py @@ -2,7 +2,7 @@ from maya import cmds import pyblish.api -from colorbleed.maya import lib +from pype.maya import lib SETTINGS = {"renderDensity", "renderWidth", @@ -28,7 +28,7 @@ class CollectYetiCache(pyblish.api.InstancePlugin): order = pyblish.api.CollectorOrder + 0.45 label = "Collect Yeti Cache" - families = ["colorbleed.yetiRig", "colorbleed.yeticache"] + families = ["yetiRig", "yeticache"] hosts = ["maya"] tasks = ["animation", "fx"] diff --git a/pype/plugins/maya/publish/collect_yeti_rig.py b/pype/plugins/maya/publish/collect_yeti_rig.py index e6d4ab803e..469651a891 100644 --- a/pype/plugins/maya/publish/collect_yeti_rig.py +++ b/pype/plugins/maya/publish/collect_yeti_rig.py @@ -5,8 +5,8 @@ from maya import cmds import pyblish.api -from colorbleed.maya import lib -from colorbleed.lib import pairwise +from pype.maya import lib +from pype.lib import pairwise SETTINGS = {"renderDensity", @@ -22,7 +22,7 @@ class CollectYetiRig(pyblish.api.InstancePlugin): order = pyblish.api.CollectorOrder + 0.4 label = "Collect Yeti Rig" - families = ["colorbleed.yetiRig"] + families = ["yetiRig"] hosts = ["maya"] def process(self, instance): diff --git a/pype/plugins/maya/publish/extract_animation.py b/pype/plugins/maya/publish/extract_animation.py index be56c6c937..abec8b8b49 100644 --- a/pype/plugins/maya/publish/extract_animation.py +++ b/pype/plugins/maya/publish/extract_animation.py @@ -3,11 +3,11 @@ import os from maya import cmds import avalon.maya -import colorbleed.api -from colorbleed.maya.lib import extract_alembic +import pype.api +from pype.maya.lib import extract_alembic -class ExtractColorbleedAnimation(colorbleed.api.Extractor): +class ExtractColorbleedAnimation(pype.api.Extractor): """Produce an alembic of just point positions and normals. Positions and normals, uvs, creases are preserved, but nothing more, @@ -17,7 +17,7 @@ class ExtractColorbleedAnimation(colorbleed.api.Extractor): label = "Extract Animation" hosts = ["maya"] - families = ["colorbleed.animation"] + families = ["animation"] def process(self, instance): diff --git a/pype/plugins/maya/publish/extract_camera_alembic.py b/pype/plugins/maya/publish/extract_camera_alembic.py index 7ed65e0d44..90f4954823 100644 --- a/pype/plugins/maya/publish/extract_camera_alembic.py +++ b/pype/plugins/maya/publish/extract_camera_alembic.py @@ -3,12 +3,12 @@ import os from maya import cmds import avalon.maya -import colorbleed.api +import pype.api -import colorbleed.maya.lib as lib +import pype.maya.lib as lib -class ExtractCameraAlembic(colorbleed.api.Extractor): +class ExtractCameraAlembic(pype.api.Extractor): """Extract a Camera as Alembic. The cameras gets baked to world space by default. Only when the instance's @@ -18,7 +18,7 @@ class ExtractCameraAlembic(colorbleed.api.Extractor): label = "Camera (Alembic)" hosts = ["maya"] - families = ["colorbleed.camera"] + families = ["camera"] def process(self, instance): diff --git a/pype/plugins/maya/publish/extract_camera_mayaAscii.py b/pype/plugins/maya/publish/extract_camera_mayaAscii.py index e8a67d4f19..4a21e7bf58 100644 --- a/pype/plugins/maya/publish/extract_camera_mayaAscii.py +++ b/pype/plugins/maya/publish/extract_camera_mayaAscii.py @@ -3,9 +3,9 @@ import os from maya import cmds import avalon.maya -import colorbleed.api -from colorbleed.lib import grouper -from colorbleed.maya import lib +import pype.api +from pype.lib import grouper +from pype.maya import lib def massage_ma_file(path): @@ -65,7 +65,7 @@ def unlock(plug): cmds.disconnectAttr(source, destination) -class ExtractCameraMayaAscii(colorbleed.api.Extractor): +class ExtractCameraMayaAscii(pype.api.Extractor): """Extract a Camera as Maya Ascii. This will create a duplicate of the camera that will be baked *with* @@ -83,7 +83,7 @@ class ExtractCameraMayaAscii(colorbleed.api.Extractor): label = "Camera (Maya Ascii)" hosts = ["maya"] - families = ["colorbleed.camera"] + families = ["camera"] def process(self, instance): diff --git a/pype/plugins/maya/publish/extract_fbx.py b/pype/plugins/maya/publish/extract_fbx.py index 139c203672..48dd5a135c 100644 --- a/pype/plugins/maya/publish/extract_fbx.py +++ b/pype/plugins/maya/publish/extract_fbx.py @@ -6,10 +6,10 @@ import maya.mel as mel import pyblish.api import avalon.maya -import colorbleed.api +import pype.api -class ExtractFBX(colorbleed.api.Extractor): +class ExtractFBX(pype.api.Extractor): """Extract FBX from Maya. This extracts reproducible FBX exports ignoring any of the settings set @@ -31,7 +31,7 @@ class ExtractFBX(colorbleed.api.Extractor): order = pyblish.api.ExtractorOrder label = "Extract FBX" - families = ["colorbleed.fbx"] + families = ["fbx"] @property def options(self): diff --git a/pype/plugins/maya/publish/extract_look.py b/pype/plugins/maya/publish/extract_look.py index 04db69a3bd..a30b1fe7d5 100644 --- a/pype/plugins/maya/publish/extract_look.py +++ b/pype/plugins/maya/publish/extract_look.py @@ -9,8 +9,8 @@ from maya import cmds import pyblish.api import avalon.maya -import colorbleed.api -import colorbleed.maya.lib as lib +import pype.api +import pype.maya.lib as lib @contextlib.contextmanager @@ -45,7 +45,7 @@ def no_workspace_dir(): os.rmdir(fake_workspace_dir) -class ExtractLook(colorbleed.api.Extractor): +class ExtractLook(pype.api.Extractor): """Extract Look (Maya Ascii + JSON) Only extracts the sets (shadingEngines and alike) alongside a .json file @@ -56,7 +56,7 @@ class ExtractLook(colorbleed.api.Extractor): label = "Extract Look (Maya ASCII + JSON)" hosts = ["maya"] - families = ["colorbleed.look"] + families = ["look"] order = pyblish.api.ExtractorOrder + 0.2 def process(self, instance): diff --git a/pype/plugins/maya/publish/extract_maya_ascii_raw.py b/pype/plugins/maya/publish/extract_maya_ascii_raw.py index bcbd39fc3d..ba5d25cc88 100644 --- a/pype/plugins/maya/publish/extract_maya_ascii_raw.py +++ b/pype/plugins/maya/publish/extract_maya_ascii_raw.py @@ -3,10 +3,10 @@ import os from maya import cmds import avalon.maya -import colorbleed.api +import pype.api -class ExtractMayaAsciiRaw(colorbleed.api.Extractor): +class ExtractMayaAsciiRaw(pype.api.Extractor): """Extract as Maya Ascii (raw) This will preserve all references, construction history, etc. @@ -15,7 +15,7 @@ class ExtractMayaAsciiRaw(colorbleed.api.Extractor): label = "Maya ASCII (Raw)" hosts = ["maya"] - families = ["colorbleed.mayaAscii"] + families = ["mayaAscii"] def process(self, instance): diff --git a/pype/plugins/maya/publish/extract_model.py b/pype/plugins/maya/publish/extract_model.py index 466ee73174..302a899793 100644 --- a/pype/plugins/maya/publish/extract_model.py +++ b/pype/plugins/maya/publish/extract_model.py @@ -3,11 +3,11 @@ import os from maya import cmds import avalon.maya -import colorbleed.api -import colorbleed.maya.lib as lib +import pype.api +import pype.maya.lib as lib -class ExtractModel(colorbleed.api.Extractor): +class ExtractModel(pype.api.Extractor): """Extract as Model (Maya Ascii) Only extracts contents based on the original "setMembers" data to ensure @@ -24,7 +24,7 @@ class ExtractModel(colorbleed.api.Extractor): label = "Model (Maya ASCII)" hosts = ["maya"] - families = ["colorbleed.model"] + families = ["model"] def process(self, instance): diff --git a/pype/plugins/maya/publish/extract_pointcache.py b/pype/plugins/maya/publish/extract_pointcache.py index 3fcdf3cb58..e703089287 100644 --- a/pype/plugins/maya/publish/extract_pointcache.py +++ b/pype/plugins/maya/publish/extract_pointcache.py @@ -3,11 +3,11 @@ import os from maya import cmds import avalon.maya -import colorbleed.api -from colorbleed.maya.lib import extract_alembic +import pype.api +from pype.maya.lib import extract_alembic -class ExtractColorbleedAlembic(colorbleed.api.Extractor): +class ExtractColorbleedAlembic(pype.api.Extractor): """Produce an alembic of just point positions and normals. Positions and normals, uvs, creases are preserved, but nothing more, @@ -17,8 +17,8 @@ class ExtractColorbleedAlembic(colorbleed.api.Extractor): label = "Extract Pointcache (Alembic)" hosts = ["maya"] - families = ["colorbleed.pointcache", - "colorbleed.model"] + families = ["pointcache", + "model"] def process(self, instance): diff --git a/pype/plugins/maya/publish/extract_rig.py b/pype/plugins/maya/publish/extract_rig.py index 7db6adfe43..6a92111bc7 100644 --- a/pype/plugins/maya/publish/extract_rig.py +++ b/pype/plugins/maya/publish/extract_rig.py @@ -3,15 +3,15 @@ import os from maya import cmds import avalon.maya -import colorbleed.api +import pype.api -class ExtractColorbleedRig(colorbleed.api.Extractor): +class ExtractColorbleedRig(pype.api.Extractor): """Extract rig as Maya Ascii""" label = "Extract Rig (Maya ASCII)" hosts = ["maya"] - families = ["colorbleed.rig"] + families = ["rig"] def process(self, instance): diff --git a/pype/plugins/maya/publish/extract_setdress.py b/pype/plugins/maya/publish/extract_setdress.py index 444e8f3d02..c4d613dc61 100644 --- a/pype/plugins/maya/publish/extract_setdress.py +++ b/pype/plugins/maya/publish/extract_setdress.py @@ -2,13 +2,13 @@ import json import os -import colorbleed.api -from colorbleed.maya.lib import extract_alembic +import pype.api +from pype.maya.lib import extract_alembic from maya import cmds -class ExtractSetDress(colorbleed.api.Extractor): +class ExtractSetDress(pype.api.Extractor): """Produce an alembic of just point positions and normals. Positions and normals are preserved, but nothing more, @@ -18,7 +18,7 @@ class ExtractSetDress(colorbleed.api.Extractor): label = "Extract Set Dress" hosts = ["maya"] - families = ["colorbleed.setdress"] + families = ["setdress"] def process(self, instance): diff --git a/pype/plugins/maya/publish/extract_vrayproxy.py b/pype/plugins/maya/publish/extract_vrayproxy.py index 265828b20d..5c68f3ca81 100644 --- a/pype/plugins/maya/publish/extract_vrayproxy.py +++ b/pype/plugins/maya/publish/extract_vrayproxy.py @@ -1,12 +1,12 @@ import os import avalon.maya -import colorbleed.api +import pype.api from maya import cmds -class ExtractVRayProxy(colorbleed.api.Extractor): +class ExtractVRayProxy(pype.api.Extractor): """Extract the content of the instance to a vrmesh file Things to pay attention to: @@ -16,7 +16,7 @@ class ExtractVRayProxy(colorbleed.api.Extractor): label = "VRay Proxy (.vrmesh)" hosts = ["maya"] - families = ["colorbleed.vrayproxy"] + families = ["vrayproxy"] def process(self, instance): diff --git a/pype/plugins/maya/publish/extract_yeti_cache.py b/pype/plugins/maya/publish/extract_yeti_cache.py index 481586374a..e8cbb02b25 100644 --- a/pype/plugins/maya/publish/extract_yeti_cache.py +++ b/pype/plugins/maya/publish/extract_yeti_cache.py @@ -3,10 +3,10 @@ import json from maya import cmds -import colorbleed.api +import pype.api -class ExtractYetiCache(colorbleed.api.Extractor): +class ExtractYetiCache(pype.api.Extractor): """Produce an alembic of just point positions and normals. Positions and normals are preserved, but nothing more, @@ -16,7 +16,7 @@ class ExtractYetiCache(colorbleed.api.Extractor): label = "Extract Yeti Cache" hosts = ["maya"] - families = ["colorbleed.yetiRig", "colorbleed.yeticache"] + families = ["yetiRig", "yeticache"] def process(self, instance): diff --git a/pype/plugins/maya/publish/extract_yeti_rig.py b/pype/plugins/maya/publish/extract_yeti_rig.py index 68fe9b118d..904ec2314e 100644 --- a/pype/plugins/maya/publish/extract_yeti_rig.py +++ b/pype/plugins/maya/publish/extract_yeti_rig.py @@ -5,8 +5,8 @@ import contextlib from maya import cmds import avalon.maya.lib as lib -import colorbleed.api -import colorbleed.maya.lib as maya +import pype.api +import pype.maya.lib as maya @contextlib.contextmanager @@ -88,12 +88,12 @@ def yetigraph_attribute_values(assumed_destination, resources): pass -class ExtractYetiRig(colorbleed.api.Extractor): +class ExtractYetiRig(pype.api.Extractor): """Extract the Yeti rig to a MayaAscii and write the Yeti rig data""" label = "Extract Yeti Rig" hosts = ["maya"] - families = ["colorbleed.yetiRig"] + families = ["yetiRig"] def process(self, instance): diff --git a/pype/plugins/maya/publish/increment_current_file_deadline.py b/pype/plugins/maya/publish/increment_current_file_deadline.py index 40a7634fb7..527f3d781d 100644 --- a/pype/plugins/maya/publish/increment_current_file_deadline.py +++ b/pype/plugins/maya/publish/increment_current_file_deadline.py @@ -11,16 +11,16 @@ class IncrementCurrentFileDeadline(pyblish.api.ContextPlugin): label = "Increment current file" order = pyblish.api.IntegratorOrder + 9.0 hosts = ["maya"] - families = ["colorbleed.renderlayer", - "colorbleed.vrayscene"] + families = ["renderlayer", + "vrayscene"] optional = True def process(self, context): import os from maya import cmds - from colorbleed.lib import version_up - from colorbleed.action import get_errored_plugins_from_data + from pype.lib import version_up + from pype.action import get_errored_plugins_from_data errored_plugins = get_errored_plugins_from_data(context) if any(plugin.__name__ == "MayaSubmitDeadline" diff --git a/pype/plugins/maya/publish/save_scene.py b/pype/plugins/maya/publish/save_scene.py index bf80bc9699..d3e1597e78 100644 --- a/pype/plugins/maya/publish/save_scene.py +++ b/pype/plugins/maya/publish/save_scene.py @@ -9,7 +9,7 @@ class SaveCurrentScene(pyblish.api.ContextPlugin): label = "Save current file" order = pyblish.api.IntegratorOrder - 0.49 hosts = ["maya"] - families = ["colorbleed.renderlayer"] + families = ["renderlayer"] def process(self, context): import maya.cmds as cmds diff --git a/pype/plugins/maya/publish/submit_maya_deadline.py b/pype/plugins/maya/publish/submit_maya_deadline.py index 430f121779..6a6cabdf93 100644 --- a/pype/plugins/maya/publish/submit_maya_deadline.py +++ b/pype/plugins/maya/publish/submit_maya_deadline.py @@ -9,7 +9,7 @@ from avalon.vendor import requests import pyblish.api -import colorbleed.maya.lib as lib +import pype.maya.lib as lib def get_renderer_variables(renderlayer=None): @@ -99,7 +99,7 @@ class MayaSubmitDeadline(pyblish.api.InstancePlugin): label = "Submit to Deadline" order = pyblish.api.IntegratorOrder hosts = ["maya"] - families = ["colorbleed.renderlayer"] + families = ["renderlayer"] def process(self, instance): diff --git a/pype/plugins/maya/publish/submit_vray_deadline.py b/pype/plugins/maya/publish/submit_vray_deadline.py index 7036a9f1eb..d43e92c6d8 100644 --- a/pype/plugins/maya/publish/submit_vray_deadline.py +++ b/pype/plugins/maya/publish/submit_vray_deadline.py @@ -24,7 +24,7 @@ class VraySubmitDeadline(pyblish.api.InstancePlugin): label = "Submit to Deadline ( vrscene )" order = pyblish.api.IntegratorOrder hosts = ["maya"] - families = ["colorbleed.vrayscene"] + families = ["vrayscene"] def process(self, instance): diff --git a/pype/plugins/maya/publish/validate_animation_content.py b/pype/plugins/maya/publish/validate_animation_content.py index b595f14d4a..4dd56e9c09 100644 --- a/pype/plugins/maya/publish/validate_animation_content.py +++ b/pype/plugins/maya/publish/validate_animation_content.py @@ -1,6 +1,6 @@ import pyblish.api -import colorbleed.api -import colorbleed.maya.action +import pype.api +import pype.maya.action class ValidateAnimationContent(pyblish.api.InstancePlugin): @@ -11,11 +11,11 @@ class ValidateAnimationContent(pyblish.api.InstancePlugin): """ - order = colorbleed.api.ValidateContentsOrder + order = pype.api.ValidateContentsOrder hosts = ["maya"] - families = ["colorbleed.animation"] + families = ["animation"] label = "Animation Content" - actions = [colorbleed.maya.action.SelectInvalidAction] + actions = [pype.maya.action.SelectInvalidAction] @classmethod def get_invalid(cls, instance): diff --git a/pype/plugins/maya/publish/validate_animation_out_set_related_node_ids.py b/pype/plugins/maya/publish/validate_animation_out_set_related_node_ids.py index 0c05d211ca..d41b13252f 100644 --- a/pype/plugins/maya/publish/validate_animation_out_set_related_node_ids.py +++ b/pype/plugins/maya/publish/validate_animation_out_set_related_node_ids.py @@ -1,9 +1,9 @@ import maya.cmds as cmds import pyblish.api -import colorbleed.api -import colorbleed.maya.action -import colorbleed.maya.lib as lib +import pype.api +import pype.maya.action +import pype.maya.lib as lib class ValidateOutRelatedNodeIds(pyblish.api.InstancePlugin): @@ -16,11 +16,11 @@ class ValidateOutRelatedNodeIds(pyblish.api.InstancePlugin): """ - order = colorbleed.api.ValidateContentsOrder - families = ['colorbleed.animation', "colorbleed.pointcache"] + order = pype.api.ValidateContentsOrder + families = ['animation', "pointcache"] hosts = ['maya'] label = 'Animation Out Set Related Node Ids' - actions = [colorbleed.maya.action.SelectInvalidAction, colorbleed.api.RepairAction] + actions = [pype.maya.action.SelectInvalidAction, pype.api.RepairAction] def process(self, instance): """Process all meshes""" diff --git a/pype/plugins/maya/publish/validate_camera_attributes.py b/pype/plugins/maya/publish/validate_camera_attributes.py index 9c43e9e6ed..8223d87c5d 100644 --- a/pype/plugins/maya/publish/validate_camera_attributes.py +++ b/pype/plugins/maya/publish/validate_camera_attributes.py @@ -1,8 +1,8 @@ from maya import cmds import pyblish.api -import colorbleed.api -import colorbleed.maya.action +import pype.api +import pype.maya.action class ValidateCameraAttributes(pyblish.api.InstancePlugin): @@ -14,11 +14,11 @@ class ValidateCameraAttributes(pyblish.api.InstancePlugin): """ - order = colorbleed.api.ValidateContentsOrder - families = ['colorbleed.camera'] + order = pype.api.ValidateContentsOrder + families = ['camera'] hosts = ['maya'] label = 'Camera Attributes' - actions = [colorbleed.maya.action.SelectInvalidAction] + actions = [pype.maya.action.SelectInvalidAction] DEFAULTS = [ ("filmFitOffset", 0.0), diff --git a/pype/plugins/maya/publish/validate_camera_contents.py b/pype/plugins/maya/publish/validate_camera_contents.py index 0b7ba9735d..f3e2a6c121 100644 --- a/pype/plugins/maya/publish/validate_camera_contents.py +++ b/pype/plugins/maya/publish/validate_camera_contents.py @@ -1,8 +1,8 @@ from maya import cmds import pyblish.api -import colorbleed.api -import colorbleed.maya.action +import pype.api +import pype.maya.action class ValidateCameraContents(pyblish.api.InstancePlugin): @@ -15,11 +15,11 @@ class ValidateCameraContents(pyblish.api.InstancePlugin): """ - order = colorbleed.api.ValidateContentsOrder - families = ['colorbleed.camera'] + order = pype.api.ValidateContentsOrder + families = ['camera'] hosts = ['maya'] label = 'Camera Contents' - actions = [colorbleed.maya.action.SelectInvalidAction] + actions = [pype.maya.action.SelectInvalidAction] @classmethod def get_invalid(cls, instance): diff --git a/pype/plugins/maya/publish/validate_current_renderlayer_renderable.py b/pype/plugins/maya/publish/validate_current_renderlayer_renderable.py index 8f09941f06..aa6ffa555c 100644 --- a/pype/plugins/maya/publish/validate_current_renderlayer_renderable.py +++ b/pype/plugins/maya/publish/validate_current_renderlayer_renderable.py @@ -1,7 +1,7 @@ import pyblish.api from maya import cmds -from colorbleed.plugin import contextplugin_should_run +from pype.plugin import contextplugin_should_run class ValidateCurrentRenderLayerIsRenderable(pyblish.api.ContextPlugin): @@ -19,7 +19,7 @@ class ValidateCurrentRenderLayerIsRenderable(pyblish.api.ContextPlugin): label = "Current Render Layer Has Renderable Camera" order = pyblish.api.ValidatorOrder hosts = ["maya"] - families = ["colorbleed.renderlayer"] + families = ["renderlayer"] def process(self, context): diff --git a/pype/plugins/maya/publish/validate_deadline_connection.py b/pype/plugins/maya/publish/validate_deadline_connection.py index 0a962e7afc..afd8564c07 100644 --- a/pype/plugins/maya/publish/validate_deadline_connection.py +++ b/pype/plugins/maya/publish/validate_deadline_connection.py @@ -2,7 +2,7 @@ import pyblish.api import avalon.api as api from avalon.vendor import requests -from colorbleed.plugin import contextplugin_should_run +from pype.plugin import contextplugin_should_run class ValidateDeadlineConnection(pyblish.api.ContextPlugin): @@ -11,7 +11,7 @@ class ValidateDeadlineConnection(pyblish.api.ContextPlugin): label = "Validate Deadline Web Service" order = pyblish.api.ValidatorOrder hosts = ["maya"] - families = ["colorbleed.renderlayer"] + families = ["renderlayer"] def process(self, context): diff --git a/pype/plugins/maya/publish/validate_frame_range.py b/pype/plugins/maya/publish/validate_frame_range.py index 05b64ccf17..78bce85b96 100644 --- a/pype/plugins/maya/publish/validate_frame_range.py +++ b/pype/plugins/maya/publish/validate_frame_range.py @@ -1,5 +1,5 @@ import pyblish.api -import colorbleed.api +import pype.api class ValidateFrameRange(pyblish.api.InstancePlugin): @@ -16,11 +16,11 @@ class ValidateFrameRange(pyblish.api.InstancePlugin): """ label = "Validate Frame Range" - order = colorbleed.api.ValidateContentsOrder - families = ["colorbleed.animation", - "colorbleed.pointcache", - "colorbleed.camera", - "colorbleed.renderlayer", + order = pype.api.ValidateContentsOrder + families = ["animation", + "pointcache", + "camera", + "renderlayer", "oolorbleed.vrayproxy"] def process(self, instance): diff --git a/pype/plugins/maya/publish/validate_instance_has_members.py b/pype/plugins/maya/publish/validate_instance_has_members.py index e0ea93b85c..76c93b4c85 100644 --- a/pype/plugins/maya/publish/validate_instance_has_members.py +++ b/pype/plugins/maya/publish/validate_instance_has_members.py @@ -1,15 +1,15 @@ import pyblish.api -import colorbleed.api -import colorbleed.maya.action +import pype.api +import pype.maya.action class ValidateInstanceHasMembers(pyblish.api.InstancePlugin): """Validates instance objectSet has *any* members.""" - order = colorbleed.api.ValidateContentsOrder + order = pype.api.ValidateContentsOrder hosts = ["maya"] label = 'Instance has members' - actions = [colorbleed.maya.action.SelectInvalidAction] + actions = [pype.maya.action.SelectInvalidAction] @classmethod def get_invalid(cls, instance): diff --git a/pype/plugins/maya/publish/validate_instance_subset.py b/pype/plugins/maya/publish/validate_instance_subset.py index 6a26d09594..19c60e4f64 100644 --- a/pype/plugins/maya/publish/validate_instance_subset.py +++ b/pype/plugins/maya/publish/validate_instance_subset.py @@ -1,5 +1,5 @@ import pyblish.api -import colorbleed.api +import pype.api import string # Allow only characters, numbers and underscore @@ -16,7 +16,7 @@ def validate_name(subset): class ValidateSubsetName(pyblish.api.InstancePlugin): """Validates subset name has only valid characters""" - order = colorbleed.api.ValidateContentsOrder + order = pype.api.ValidateContentsOrder families = ["*"] label = "Subset Name" diff --git a/pype/plugins/maya/publish/validate_instancer_content.py b/pype/plugins/maya/publish/validate_instancer_content.py index 91b7b15044..68ee17bca6 100644 --- a/pype/plugins/maya/publish/validate_instancer_content.py +++ b/pype/plugins/maya/publish/validate_instancer_content.py @@ -1,7 +1,7 @@ import maya.cmds as cmds import pyblish.api -import colorbleed.maya.lib as lib +import pype.maya.lib as lib class ValidateInstancerContent(pyblish.api.InstancePlugin): @@ -12,7 +12,7 @@ class ValidateInstancerContent(pyblish.api.InstancePlugin): """ order = pyblish.api.ValidatorOrder label = 'Instancer Content' - families = ['colorbleed.instancer'] + families = ['instancer'] def process(self, instance): diff --git a/pype/plugins/maya/publish/validate_instancer_frame_ranges.py b/pype/plugins/maya/publish/validate_instancer_frame_ranges.py index c7307c5a2a..f31014e6e9 100644 --- a/pype/plugins/maya/publish/validate_instancer_frame_ranges.py +++ b/pype/plugins/maya/publish/validate_instancer_frame_ranges.py @@ -44,7 +44,7 @@ class ValidateInstancerFrameRanges(pyblish.api.InstancePlugin): """ order = pyblish.api.ValidatorOrder label = 'Instancer Cache Frame Ranges' - families = ['colorbleed.instancer'] + families = ['instancer'] @classmethod def get_invalid(cls, instance): diff --git a/pype/plugins/maya/publish/validate_joints_hidden.py b/pype/plugins/maya/publish/validate_joints_hidden.py index 1c8e44e843..4b20060602 100644 --- a/pype/plugins/maya/publish/validate_joints_hidden.py +++ b/pype/plugins/maya/publish/validate_joints_hidden.py @@ -1,9 +1,9 @@ from maya import cmds import pyblish.api -import colorbleed.api -import colorbleed.maya.action -import colorbleed.maya.lib as lib +import pype.api +import pype.maya.action +import pype.maya.lib as lib class ValidateJointsHidden(pyblish.api.InstancePlugin): @@ -17,14 +17,14 @@ class ValidateJointsHidden(pyblish.api.InstancePlugin): """ - order = colorbleed.api.ValidateContentsOrder + order = pype.api.ValidateContentsOrder hosts = ['maya'] - families = ['colorbleed.rig'] + families = ['rig'] category = 'rig' version = (0, 1, 0) label = "Joints Hidden" - actions = [colorbleed.maya.action.SelectInvalidAction, - colorbleed.api.RepairAction] + actions = [pype.maya.action.SelectInvalidAction, + pype.api.RepairAction] @staticmethod def get_invalid(instance): diff --git a/pype/plugins/maya/publish/validate_look_contents.py b/pype/plugins/maya/publish/validate_look_contents.py index 2f515e970c..72fc884bfb 100644 --- a/pype/plugins/maya/publish/validate_look_contents.py +++ b/pype/plugins/maya/publish/validate_look_contents.py @@ -1,6 +1,6 @@ import pyblish.api -import colorbleed.api -import colorbleed.maya.action +import pype.api +import pype.maya.action class ValidateLookContents(pyblish.api.InstancePlugin): @@ -17,11 +17,11 @@ class ValidateLookContents(pyblish.api.InstancePlugin): """ - order = colorbleed.api.ValidateContentsOrder - families = ['colorbleed.look'] + order = pype.api.ValidateContentsOrder + families = ['look'] hosts = ['maya'] label = 'Look Data Contents' - actions = [colorbleed.maya.action.SelectInvalidAction] + actions = [pype.maya.action.SelectInvalidAction] def process(self, instance): """Process all the nodes in the instance""" diff --git a/pype/plugins/maya/publish/validate_look_default_shaders_connections.py b/pype/plugins/maya/publish/validate_look_default_shaders_connections.py index dc8e7446c9..af355e178b 100644 --- a/pype/plugins/maya/publish/validate_look_default_shaders_connections.py +++ b/pype/plugins/maya/publish/validate_look_default_shaders_connections.py @@ -1,7 +1,7 @@ from maya import cmds import pyblish.api -import colorbleed.api +import pype.api class ValidateLookDefaultShadersConnections(pyblish.api.InstancePlugin): @@ -16,8 +16,8 @@ class ValidateLookDefaultShadersConnections(pyblish.api.InstancePlugin): """ - order = colorbleed.api.ValidateContentsOrder - families = ['colorbleed.look'] + order = pype.api.ValidateContentsOrder + families = ['look'] hosts = ['maya'] label = 'Look Default Shader Connections' diff --git a/pype/plugins/maya/publish/validate_look_id_reference_edits.py b/pype/plugins/maya/publish/validate_look_id_reference_edits.py index 454320b00c..6a28daa7dc 100644 --- a/pype/plugins/maya/publish/validate_look_id_reference_edits.py +++ b/pype/plugins/maya/publish/validate_look_id_reference_edits.py @@ -2,8 +2,8 @@ from collections import defaultdict from maya import cmds import pyblish.api -import colorbleed.api -import colorbleed.maya.action +import pype.api +import pype.maya.action class ValidateLookIdReferenceEdits(pyblish.api.InstancePlugin): @@ -16,12 +16,12 @@ class ValidateLookIdReferenceEdits(pyblish.api.InstancePlugin): """ - order = colorbleed.api.ValidateContentsOrder - families = ['colorbleed.look'] + order = pype.api.ValidateContentsOrder + families = ['look'] hosts = ['maya'] label = 'Look Id Reference Edits' - actions = [colorbleed.maya.action.SelectInvalidAction, - colorbleed.api.RepairAction] + actions = [pype.maya.action.SelectInvalidAction, + pype.api.RepairAction] def process(self, instance): invalid = self.get_invalid(instance) diff --git a/pype/plugins/maya/publish/validate_look_members_unique.py b/pype/plugins/maya/publish/validate_look_members_unique.py index b611bdbb33..e9fb20d8d6 100644 --- a/pype/plugins/maya/publish/validate_look_members_unique.py +++ b/pype/plugins/maya/publish/validate_look_members_unique.py @@ -1,8 +1,8 @@ from collections import defaultdict import pyblish.api -import colorbleed.api -import colorbleed.maya.action +import pype.api +import pype.maya.action class ValidateUniqueRelationshipMembers(pyblish.api.InstancePlugin): @@ -20,13 +20,13 @@ class ValidateUniqueRelationshipMembers(pyblish.api.InstancePlugin): """ - order = colorbleed.api.ValidatePipelineOrder + order = pype.api.ValidatePipelineOrder label = 'Look members unique' hosts = ['maya'] - families = ['colorbleed.look'] + families = ['look'] - actions = [colorbleed.maya.action.SelectInvalidAction, - colorbleed.maya.action.GenerateUUIDsOnInvalidAction] + actions = [pype.maya.action.SelectInvalidAction, + pype.maya.action.GenerateUUIDsOnInvalidAction] def process(self, instance): """Process all meshes""" diff --git a/pype/plugins/maya/publish/validate_look_no_default_shaders.py b/pype/plugins/maya/publish/validate_look_no_default_shaders.py index 7485fc3cc1..dbef871a16 100644 --- a/pype/plugins/maya/publish/validate_look_no_default_shaders.py +++ b/pype/plugins/maya/publish/validate_look_no_default_shaders.py @@ -1,8 +1,8 @@ from maya import cmds import pyblish.api -import colorbleed.api -import colorbleed.maya.action +import pype.api +import pype.maya.action class ValidateLookNoDefaultShaders(pyblish.api.InstancePlugin): @@ -23,11 +23,11 @@ class ValidateLookNoDefaultShaders(pyblish.api.InstancePlugin): """ - order = colorbleed.api.ValidateContentsOrder + 0.01 - families = ['colorbleed.look'] + order = pype.api.ValidateContentsOrder + 0.01 + families = ['look'] hosts = ['maya'] label = 'Look No Default Shaders' - actions = [colorbleed.maya.action.SelectInvalidAction] + actions = [pype.maya.action.SelectInvalidAction] DEFAULT_SHADERS = {"lambert1", "initialShadingGroup", "initialParticleSE", "particleCloud1"} diff --git a/pype/plugins/maya/publish/validate_look_sets.py b/pype/plugins/maya/publish/validate_look_sets.py index 3f4bc99059..f3952b53a4 100644 --- a/pype/plugins/maya/publish/validate_look_sets.py +++ b/pype/plugins/maya/publish/validate_look_sets.py @@ -1,8 +1,8 @@ -import colorbleed.maya.action -from colorbleed.maya import lib +import pype.maya.action +from pype.maya import lib import pyblish.api -import colorbleed.api +import pype.api class ValidateLookSets(pyblish.api.InstancePlugin): @@ -38,11 +38,11 @@ class ValidateLookSets(pyblish.api.InstancePlugin): """ - order = colorbleed.api.ValidateContentsOrder - families = ['colorbleed.look'] + order = pype.api.ValidateContentsOrder + families = ['look'] hosts = ['maya'] label = 'Look Sets' - actions = [colorbleed.maya.action.SelectInvalidAction] + actions = [pype.maya.action.SelectInvalidAction] def process(self, instance): """Process all the nodes in the instance""" diff --git a/pype/plugins/maya/publish/validate_look_single_shader.py b/pype/plugins/maya/publish/validate_look_single_shader.py index 687dd2b84f..1b9ebffced 100644 --- a/pype/plugins/maya/publish/validate_look_single_shader.py +++ b/pype/plugins/maya/publish/validate_look_single_shader.py @@ -1,8 +1,8 @@ from maya import cmds import pyblish.api -import colorbleed.api -import colorbleed.maya.action +import pype.api +import pype.maya.action class ValidateSingleShader(pyblish.api.InstancePlugin): @@ -12,11 +12,11 @@ class ValidateSingleShader(pyblish.api.InstancePlugin): """ - order = colorbleed.api.ValidateContentsOrder - families = ['colorbleed.look'] + order = pype.api.ValidateContentsOrder + families = ['look'] hosts = ['maya'] label = 'Look Single Shader Per Shape' - actions = [colorbleed.maya.action.SelectInvalidAction] + actions = [pype.maya.action.SelectInvalidAction] # The default connections to check def process(self, instance): diff --git a/pype/plugins/maya/publish/validate_maya_units.py b/pype/plugins/maya/publish/validate_maya_units.py index ba38fbe512..8610c4dd25 100644 --- a/pype/plugins/maya/publish/validate_maya_units.py +++ b/pype/plugins/maya/publish/validate_maya_units.py @@ -1,18 +1,18 @@ import maya.cmds as cmds import pyblish.api -import colorbleed.api -from colorbleed import lib -import colorbleed.maya.lib as mayalib +import pype.api +from pype import lib +import pype.maya.lib as mayalib class ValidateMayaUnits(pyblish.api.ContextPlugin): """Check if the Maya units are set correct""" - order = colorbleed.api.ValidateSceneOrder + order = pype.api.ValidateSceneOrder label = "Maya Units" hosts = ['maya'] - actions = [colorbleed.api.RepairContextAction] + actions = [pype.api.RepairContextAction] def process(self, context): diff --git a/pype/plugins/maya/publish/validate_mesh_has_uv.py b/pype/plugins/maya/publish/validate_mesh_has_uv.py index 4233674ddd..0eb235db0f 100644 --- a/pype/plugins/maya/publish/validate_mesh_has_uv.py +++ b/pype/plugins/maya/publish/validate_mesh_has_uv.py @@ -3,8 +3,8 @@ import re from maya import cmds import pyblish.api -import colorbleed.api -import colorbleed.maya.action +import pype.api +import pype.maya.action def len_flattened(components): @@ -45,12 +45,12 @@ class ValidateMeshHasUVs(pyblish.api.InstancePlugin): UVs for every face. """ - order = colorbleed.api.ValidateMeshOrder + order = pype.api.ValidateMeshOrder hosts = ['maya'] - families = ['colorbleed.model'] + families = ['model'] category = 'geometry' label = 'Mesh Has UVs' - actions = [colorbleed.maya.action.SelectInvalidAction] + actions = [pype.maya.action.SelectInvalidAction] optional = True @classmethod diff --git a/pype/plugins/maya/publish/validate_mesh_lamina_faces.py b/pype/plugins/maya/publish/validate_mesh_lamina_faces.py index ca54648108..9e6e0f40b7 100644 --- a/pype/plugins/maya/publish/validate_mesh_lamina_faces.py +++ b/pype/plugins/maya/publish/validate_mesh_lamina_faces.py @@ -1,8 +1,8 @@ from maya import cmds import pyblish.api -import colorbleed.api -import colorbleed.maya.action +import pype.api +import pype.maya.action class ValidateMeshLaminaFaces(pyblish.api.InstancePlugin): @@ -12,13 +12,13 @@ class ValidateMeshLaminaFaces(pyblish.api.InstancePlugin): """ - order = colorbleed.api.ValidateMeshOrder + order = pype.api.ValidateMeshOrder hosts = ['maya'] - families = ['colorbleed.model'] + families = ['model'] category = 'geometry' version = (0, 1, 0) label = 'Mesh Lamina Faces' - actions = [colorbleed.maya.action.SelectInvalidAction] + actions = [pype.maya.action.SelectInvalidAction] @staticmethod def get_invalid(instance): diff --git a/pype/plugins/maya/publish/validate_mesh_no_negative_scale.py b/pype/plugins/maya/publish/validate_mesh_no_negative_scale.py index de60300931..ed2ded652b 100644 --- a/pype/plugins/maya/publish/validate_mesh_no_negative_scale.py +++ b/pype/plugins/maya/publish/validate_mesh_no_negative_scale.py @@ -1,8 +1,8 @@ from maya import cmds import pyblish.api -import colorbleed.api -import colorbleed.maya.action +import pype.api +import pype.maya.action class ValidateMeshNoNegativeScale(pyblish.api.Validator): @@ -17,11 +17,11 @@ class ValidateMeshNoNegativeScale(pyblish.api.Validator): """ - order = colorbleed.api.ValidateMeshOrder + order = pype.api.ValidateMeshOrder hosts = ['maya'] - families = ['colorbleed.model'] + families = ['model'] label = 'Mesh No Negative Scale' - actions = [colorbleed.maya.action.SelectInvalidAction] + actions = [pype.maya.action.SelectInvalidAction] @staticmethod def get_invalid(instance): diff --git a/pype/plugins/maya/publish/validate_mesh_non_manifold.py b/pype/plugins/maya/publish/validate_mesh_non_manifold.py index 1c5ce731fa..961e6e42ef 100644 --- a/pype/plugins/maya/publish/validate_mesh_non_manifold.py +++ b/pype/plugins/maya/publish/validate_mesh_non_manifold.py @@ -1,8 +1,8 @@ from maya import cmds import pyblish.api -import colorbleed.api -import colorbleed.maya.action +import pype.api +import pype.maya.action class ValidateMeshNonManifold(pyblish.api.Validator): @@ -13,11 +13,11 @@ class ValidateMeshNonManifold(pyblish.api.Validator): """ - order = colorbleed.api.ValidateMeshOrder + order = pype.api.ValidateMeshOrder hosts = ['maya'] - families = ['colorbleed.model'] + families = ['model'] label = 'Mesh Non-Manifold Vertices/Edges' - actions = [colorbleed.maya.action.SelectInvalidAction] + actions = [pype.maya.action.SelectInvalidAction] @staticmethod def get_invalid(instance): diff --git a/pype/plugins/maya/publish/validate_mesh_non_zero_edge.py b/pype/plugins/maya/publish/validate_mesh_non_zero_edge.py index 6f35f512a0..6ade81764b 100644 --- a/pype/plugins/maya/publish/validate_mesh_non_zero_edge.py +++ b/pype/plugins/maya/publish/validate_mesh_non_zero_edge.py @@ -1,9 +1,9 @@ from maya import cmds import pyblish.api -import colorbleed.api -import colorbleed.maya.action -import colorbleed.maya.lib as lib +import pype.api +import pype.maya.action +import pype.maya.lib as lib class ValidateMeshNonZeroEdgeLength(pyblish.api.InstancePlugin): @@ -16,13 +16,13 @@ class ValidateMeshNonZeroEdgeLength(pyblish.api.InstancePlugin): """ - order = colorbleed.api.ValidateMeshOrder - families = ['colorbleed.model'] + order = pype.api.ValidateMeshOrder + families = ['model'] hosts = ['maya'] category = 'geometry' version = (0, 1, 0) label = 'Mesh Edge Length Non Zero' - actions = [colorbleed.maya.action.SelectInvalidAction] + actions = [pype.maya.action.SelectInvalidAction] __tolerance = 1e-5 diff --git a/pype/plugins/maya/publish/validate_mesh_normals_unlocked.py b/pype/plugins/maya/publish/validate_mesh_normals_unlocked.py index 09fe2b4e4b..faa1c8e248 100644 --- a/pype/plugins/maya/publish/validate_mesh_normals_unlocked.py +++ b/pype/plugins/maya/publish/validate_mesh_normals_unlocked.py @@ -1,8 +1,8 @@ from maya import cmds import pyblish.api -import colorbleed.api -import colorbleed.maya.action +import pype.api +import pype.maya.action class ValidateMeshNormalsUnlocked(pyblish.api.Validator): @@ -13,14 +13,14 @@ class ValidateMeshNormalsUnlocked(pyblish.api.Validator): """ - order = colorbleed.api.ValidateMeshOrder + order = pype.api.ValidateMeshOrder hosts = ['maya'] - families = ['colorbleed.model'] + families = ['model'] category = 'geometry' version = (0, 1, 0) label = 'Mesh Normals Unlocked' - actions = [colorbleed.maya.action.SelectInvalidAction, - colorbleed.api.RepairAction] + actions = [pype.maya.action.SelectInvalidAction, + pype.api.RepairAction] optional = True @staticmethod diff --git a/pype/plugins/maya/publish/validate_mesh_shader_connections.py b/pype/plugins/maya/publish/validate_mesh_shader_connections.py index 723ff2d3e6..048b146886 100644 --- a/pype/plugins/maya/publish/validate_mesh_shader_connections.py +++ b/pype/plugins/maya/publish/validate_mesh_shader_connections.py @@ -1,8 +1,8 @@ from maya import cmds import pyblish.api -import colorbleed.api -import colorbleed.maya.action +import pype.api +import pype.maya.action def pairs(iterable): @@ -73,12 +73,12 @@ class ValidateMeshShaderConnections(pyblish.api.InstancePlugin): """ - order = colorbleed.api.ValidateMeshOrder + order = pype.api.ValidateMeshOrder hosts = ['maya'] - families = ['colorbleed.model'] + families = ['model'] label = "Mesh Shader Connections" - actions = [colorbleed.maya.action.SelectInvalidAction, - colorbleed.api.RepairAction] + actions = [pype.maya.action.SelectInvalidAction, + pype.api.RepairAction] def process(self, instance): """Process all the nodes in the instance 'objectSet'""" diff --git a/pype/plugins/maya/publish/validate_mesh_single_uv_set.py b/pype/plugins/maya/publish/validate_mesh_single_uv_set.py index 774c7899d2..eeddeb3c9c 100644 --- a/pype/plugins/maya/publish/validate_mesh_single_uv_set.py +++ b/pype/plugins/maya/publish/validate_mesh_single_uv_set.py @@ -1,9 +1,9 @@ from maya import cmds import pyblish.api -import colorbleed.api -import colorbleed.maya.action -import colorbleed.maya.lib as lib +import pype.api +import pype.maya.action +import pype.maya.lib as lib class ValidateMeshSingleUVSet(pyblish.api.InstancePlugin): @@ -15,15 +15,15 @@ class ValidateMeshSingleUVSet(pyblish.api.InstancePlugin): """ - order = colorbleed.api.ValidateMeshOrder + order = pype.api.ValidateMeshOrder hosts = ['maya'] - families = ['colorbleed.model', 'colorbleed.pointcache'] + families = ['model', 'pointcache'] category = 'uv' optional = True version = (0, 1, 0) label = "Mesh Single UV Set" - actions = [colorbleed.maya.action.SelectInvalidAction, - colorbleed.api.RepairAction] + actions = [pype.maya.action.SelectInvalidAction, + pype.api.RepairAction] @staticmethod def get_invalid(instance): diff --git a/pype/plugins/maya/publish/validate_mesh_uv_set_map1.py b/pype/plugins/maya/publish/validate_mesh_uv_set_map1.py index 00c9d800cf..8794fa9de1 100644 --- a/pype/plugins/maya/publish/validate_mesh_uv_set_map1.py +++ b/pype/plugins/maya/publish/validate_mesh_uv_set_map1.py @@ -1,8 +1,8 @@ from maya import cmds import pyblish.api -import colorbleed.api -import colorbleed.maya.action +import pype.api +import pype.maya.action class ValidateMeshUVSetMap1(pyblish.api.InstancePlugin): @@ -15,13 +15,13 @@ class ValidateMeshUVSetMap1(pyblish.api.InstancePlugin): """ - order = colorbleed.api.ValidateMeshOrder + order = pype.api.ValidateMeshOrder hosts = ['maya'] - families = ['colorbleed.model'] + families = ['model'] optional = True label = "Mesh has map1 UV Set" - actions = [colorbleed.maya.action.SelectInvalidAction, - colorbleed.api.RepairAction] + actions = [pype.maya.action.SelectInvalidAction, + pype.api.RepairAction] @staticmethod def get_invalid(instance): diff --git a/pype/plugins/maya/publish/validate_mesh_vertices_have_edges.py b/pype/plugins/maya/publish/validate_mesh_vertices_have_edges.py index 41efd27f89..2aaf11f6c0 100644 --- a/pype/plugins/maya/publish/validate_mesh_vertices_have_edges.py +++ b/pype/plugins/maya/publish/validate_mesh_vertices_have_edges.py @@ -3,8 +3,8 @@ import re from maya import cmds import pyblish.api -import colorbleed.api -import colorbleed.maya.action +import pype.api +import pype.maya.action def len_flattened(components): @@ -57,13 +57,13 @@ class ValidateMeshVerticesHaveEdges(pyblish.api.InstancePlugin): """ - order = colorbleed.api.ValidateMeshOrder + order = pype.api.ValidateMeshOrder hosts = ['maya'] - families = ['colorbleed.model'] + families = ['model'] category = 'geometry' label = 'Mesh Vertices Have Edges' - actions = [colorbleed.maya.action.SelectInvalidAction, - colorbleed.api.RepairAction] + actions = [pype.maya.action.SelectInvalidAction, + pype.api.RepairAction] @classmethod def repair(cls, instance): diff --git a/pype/plugins/maya/publish/validate_model_content.py b/pype/plugins/maya/publish/validate_model_content.py index c9bbb2c23e..e76e102672 100644 --- a/pype/plugins/maya/publish/validate_model_content.py +++ b/pype/plugins/maya/publish/validate_model_content.py @@ -1,9 +1,9 @@ from maya import cmds import pyblish.api -import colorbleed.api -import colorbleed.maya.action -import colorbleed.maya.lib as lib +import pype.api +import pype.maya.action +import pype.maya.lib as lib class ValidateModelContent(pyblish.api.InstancePlugin): @@ -14,11 +14,11 @@ class ValidateModelContent(pyblish.api.InstancePlugin): """ - order = colorbleed.api.ValidateContentsOrder + order = pype.api.ValidateContentsOrder hosts = ["maya"] - families = ["colorbleed.model"] + families = ["model"] label = "Model Content" - actions = [colorbleed.maya.action.SelectInvalidAction] + actions = [pype.maya.action.SelectInvalidAction] @classmethod def get_invalid(cls, instance): diff --git a/pype/plugins/maya/publish/validate_no_animation.py b/pype/plugins/maya/publish/validate_no_animation.py index bde5775fe7..21749de7cb 100644 --- a/pype/plugins/maya/publish/validate_no_animation.py +++ b/pype/plugins/maya/publish/validate_no_animation.py @@ -1,8 +1,8 @@ from maya import cmds import pyblish.api -import colorbleed.api -import colorbleed.maya.action +import pype.api +import pype.maya.action class ValidateNoAnimation(pyblish.api.Validator): @@ -14,12 +14,12 @@ class ValidateNoAnimation(pyblish.api.Validator): """ - order = colorbleed.api.ValidateContentsOrder + order = pype.api.ValidateContentsOrder label = "No Animation" hosts = ["maya"] - families = ["colorbleed.model"] + families = ["model"] optional = True - actions = [colorbleed.maya.action.SelectInvalidAction] + actions = [pype.maya.action.SelectInvalidAction] def process(self, instance): diff --git a/pype/plugins/maya/publish/validate_no_default_camera.py b/pype/plugins/maya/publish/validate_no_default_camera.py index e41d2eea99..3d523e8974 100644 --- a/pype/plugins/maya/publish/validate_no_default_camera.py +++ b/pype/plugins/maya/publish/validate_no_default_camera.py @@ -1,8 +1,8 @@ from maya import cmds import pyblish.api -import colorbleed.api -import colorbleed.maya.action +import pype.api +import pype.maya.action class ValidateNoDefaultCameras(pyblish.api.InstancePlugin): @@ -13,12 +13,12 @@ class ValidateNoDefaultCameras(pyblish.api.InstancePlugin): settings when being loaded and sometimes being skipped. """ - order = colorbleed.api.ValidateContentsOrder + order = pype.api.ValidateContentsOrder hosts = ['maya'] - families = ['colorbleed.camera'] + families = ['camera'] version = (0, 1, 0) label = "No Default Cameras" - actions = [colorbleed.maya.action.SelectInvalidAction] + actions = [pype.maya.action.SelectInvalidAction] @staticmethod def get_invalid(instance): diff --git a/pype/plugins/maya/publish/validate_no_namespace.py b/pype/plugins/maya/publish/validate_no_namespace.py index 46f1dbe49c..626dbcd4b8 100644 --- a/pype/plugins/maya/publish/validate_no_namespace.py +++ b/pype/plugins/maya/publish/validate_no_namespace.py @@ -2,8 +2,8 @@ import pymel.core as pm import maya.cmds as cmds import pyblish.api -import colorbleed.api -import colorbleed.maya.action +import pype.api +import pype.maya.action def get_namespace(node_name): @@ -16,14 +16,14 @@ def get_namespace(node_name): class ValidateNoNamespace(pyblish.api.InstancePlugin): """Ensure the nodes don't have a namespace""" - order = colorbleed.api.ValidateContentsOrder + order = pype.api.ValidateContentsOrder hosts = ['maya'] - families = ['colorbleed.model'] + families = ['model'] category = 'cleanup' version = (0, 1, 0) label = 'No Namespaces' - actions = [colorbleed.maya.action.SelectInvalidAction, - colorbleed.api.RepairAction] + actions = [pype.maya.action.SelectInvalidAction, + pype.api.RepairAction] @staticmethod def get_invalid(instance): diff --git a/pype/plugins/maya/publish/validate_no_null_transforms.py b/pype/plugins/maya/publish/validate_no_null_transforms.py index d9dff290b8..156e0528a1 100644 --- a/pype/plugins/maya/publish/validate_no_null_transforms.py +++ b/pype/plugins/maya/publish/validate_no_null_transforms.py @@ -1,8 +1,8 @@ import maya.cmds as cmds import pyblish.api -import colorbleed.api -import colorbleed.maya.action +import pype.api +import pype.maya.action def has_shape_children(node): @@ -37,14 +37,14 @@ class ValidateNoNullTransforms(pyblish.api.InstancePlugin): """ - order = colorbleed.api.ValidateContentsOrder + order = pype.api.ValidateContentsOrder hosts = ['maya'] - families = ['colorbleed.model'] + families = ['model'] category = 'cleanup' version = (0, 1, 0) label = 'No Empty/Null Transforms' - actions = [colorbleed.api.RepairAction, - colorbleed.maya.action.SelectInvalidAction] + actions = [pype.api.RepairAction, + pype.maya.action.SelectInvalidAction] @staticmethod def get_invalid(instance): diff --git a/pype/plugins/maya/publish/validate_no_unknown_nodes.py b/pype/plugins/maya/publish/validate_no_unknown_nodes.py index 3fdd087b3d..cc2b9fc009 100644 --- a/pype/plugins/maya/publish/validate_no_unknown_nodes.py +++ b/pype/plugins/maya/publish/validate_no_unknown_nodes.py @@ -1,8 +1,8 @@ from maya import cmds import pyblish.api -import colorbleed.api -import colorbleed.maya.action +import pype.api +import pype.maya.action class ValidateNoUnknownNodes(pyblish.api.InstancePlugin): @@ -16,12 +16,12 @@ class ValidateNoUnknownNodes(pyblish.api.InstancePlugin): """ - order = colorbleed.api.ValidateContentsOrder + order = pype.api.ValidateContentsOrder hosts = ['maya'] - families = ['colorbleed.model', 'colorbleed.rig'] + families = ['model', 'rig'] optional = True label = "Unknown Nodes" - actions = [colorbleed.maya.action.SelectInvalidAction] + actions = [pype.maya.action.SelectInvalidAction] @staticmethod def get_invalid(instance): diff --git a/pype/plugins/maya/publish/validate_no_vraymesh.py b/pype/plugins/maya/publish/validate_no_vraymesh.py index 575ad7e549..27e5e6a006 100644 --- a/pype/plugins/maya/publish/validate_no_vraymesh.py +++ b/pype/plugins/maya/publish/validate_no_vraymesh.py @@ -7,7 +7,7 @@ class ValidateNoVRayMesh(pyblish.api.InstancePlugin): order = pyblish.api.ValidatorOrder label = 'No V-Ray Proxies (VRayMesh)' - families = ["colorbleed.pointcache"] + families = ["pointcache"] def process(self, instance): diff --git a/pype/plugins/maya/publish/validate_node_ids.py b/pype/plugins/maya/publish/validate_node_ids.py index f98f1a06f7..c3b989f282 100644 --- a/pype/plugins/maya/publish/validate_node_ids.py +++ b/pype/plugins/maya/publish/validate_node_ids.py @@ -1,8 +1,8 @@ import pyblish.api -import colorbleed.api -import colorbleed.maya.action +import pype.api +import pype.maya.action -from colorbleed.maya import lib +from pype.maya import lib class ValidateNodeIDs(pyblish.api.InstancePlugin): @@ -14,19 +14,19 @@ class ValidateNodeIDs(pyblish.api.InstancePlugin): """ - order = colorbleed.api.ValidatePipelineOrder + order = pype.api.ValidatePipelineOrder label = 'Instance Nodes Have ID' hosts = ['maya'] - families = ["colorbleed.model", - "colorbleed.look", - "colorbleed.rig", - "colorbleed.pointcache", - "colorbleed.animation", - "colorbleed.setdress", - "colorbleed.yetiRig"] + families = ["model", + "look", + "rig", + "pointcache", + "animation", + "setdress", + "yetiRig"] - actions = [colorbleed.maya.action.SelectInvalidAction, - colorbleed.maya.action.GenerateUUIDsOnInvalidAction] + actions = [pype.maya.action.SelectInvalidAction, + pype.maya.action.GenerateUUIDsOnInvalidAction] def process(self, instance): """Process all meshes""" diff --git a/pype/plugins/maya/publish/validate_node_ids_deformed_shapes.py b/pype/plugins/maya/publish/validate_node_ids_deformed_shapes.py index 99df6a1b63..75ec162a70 100644 --- a/pype/plugins/maya/publish/validate_node_ids_deformed_shapes.py +++ b/pype/plugins/maya/publish/validate_node_ids_deformed_shapes.py @@ -1,9 +1,9 @@ from maya import cmds import pyblish.api -import colorbleed.api -import colorbleed.maya.action -import colorbleed.maya.lib as lib +import pype.api +import pype.maya.action +import pype.maya.lib as lib class ValidateNodeIdsDeformedShape(pyblish.api.InstancePlugin): @@ -16,11 +16,11 @@ class ValidateNodeIdsDeformedShape(pyblish.api.InstancePlugin): """ - order = colorbleed.api.ValidateContentsOrder - families = ['colorbleed.look'] + order = pype.api.ValidateContentsOrder + families = ['look'] hosts = ['maya'] label = 'Deformed shape ids' - actions = [colorbleed.maya.action.SelectInvalidAction, colorbleed.api.RepairAction] + actions = [pype.maya.action.SelectInvalidAction, pype.api.RepairAction] def process(self, instance): """Process all the nodes in the instance""" diff --git a/pype/plugins/maya/publish/validate_node_ids_in_database.py b/pype/plugins/maya/publish/validate_node_ids_in_database.py index d808152245..7347ce2ab2 100644 --- a/pype/plugins/maya/publish/validate_node_ids_in_database.py +++ b/pype/plugins/maya/publish/validate_node_ids_in_database.py @@ -2,9 +2,9 @@ import pyblish.api import avalon.io as io -import colorbleed.api -import colorbleed.maya.action -from colorbleed.maya import lib +import pype.api +import pype.maya.action +from pype.maya import lib class ValidateNodeIdsInDatabase(pyblish.api.InstancePlugin): @@ -18,13 +18,13 @@ class ValidateNodeIdsInDatabase(pyblish.api.InstancePlugin): """ - order = colorbleed.api.ValidatePipelineOrder + order = pype.api.ValidatePipelineOrder label = 'Node Ids in Database' hosts = ['maya'] families = ["*"] - actions = [colorbleed.maya.action.SelectInvalidAction, - colorbleed.maya.action.GenerateUUIDsOnInvalidAction] + actions = [pype.maya.action.SelectInvalidAction, + pype.maya.action.GenerateUUIDsOnInvalidAction] def process(self, instance): invalid = self.get_invalid(instance) diff --git a/pype/plugins/maya/publish/validate_node_ids_related.py b/pype/plugins/maya/publish/validate_node_ids_related.py index c9185b4e02..aab6cb8003 100644 --- a/pype/plugins/maya/publish/validate_node_ids_related.py +++ b/pype/plugins/maya/publish/validate_node_ids_related.py @@ -1,10 +1,10 @@ import pyblish.api -import colorbleed.api +import pype.api import avalon.io as io -import colorbleed.maya.action +import pype.maya.action -from colorbleed.maya import lib +from pype.maya import lib class ValidateNodeIDsRelated(pyblish.api.InstancePlugin): @@ -12,16 +12,16 @@ class ValidateNodeIDsRelated(pyblish.api.InstancePlugin): """ - order = colorbleed.api.ValidatePipelineOrder + order = pype.api.ValidatePipelineOrder label = 'Node Ids Related (ID)' hosts = ['maya'] - families = ["colorbleed.model", - "colorbleed.look", - "colorbleed.rig"] + families = ["model", + "look", + "rig"] optional = True - actions = [colorbleed.maya.action.SelectInvalidAction, - colorbleed.maya.action.GenerateUUIDsOnInvalidAction] + actions = [pype.maya.action.SelectInvalidAction, + pype.maya.action.GenerateUUIDsOnInvalidAction] def process(self, instance): """Process all nodes in instance (including hierarchy)""" diff --git a/pype/plugins/maya/publish/validate_node_ids_unique.py b/pype/plugins/maya/publish/validate_node_ids_unique.py index b32e5c0081..31e5e673de 100644 --- a/pype/plugins/maya/publish/validate_node_ids_unique.py +++ b/pype/plugins/maya/publish/validate_node_ids_unique.py @@ -1,9 +1,9 @@ from collections import defaultdict import pyblish.api -import colorbleed.api -import colorbleed.maya.action -import colorbleed.maya.lib as lib +import pype.api +import pype.maya.action +import pype.maya.lib as lib class ValidateNodeIdsUnique(pyblish.api.InstancePlugin): @@ -12,16 +12,16 @@ class ValidateNodeIdsUnique(pyblish.api.InstancePlugin): Here we ensure that what has been added to the instance is unique """ - order = colorbleed.api.ValidatePipelineOrder + order = pype.api.ValidatePipelineOrder label = 'Non Duplicate Instance Members (ID)' hosts = ['maya'] - families = ["colorbleed.model", - "colorbleed.look", - "colorbleed.rig", - "colorbleed.yetiRig"] + families = ["model", + "look", + "rig", + "yetiRig"] - actions = [colorbleed.maya.action.SelectInvalidAction, - colorbleed.maya.action.GenerateUUIDsOnInvalidAction] + actions = [pype.maya.action.SelectInvalidAction, + pype.maya.action.GenerateUUIDsOnInvalidAction] def process(self, instance): """Process all meshes""" diff --git a/pype/plugins/maya/publish/validate_node_no_ghosting.py b/pype/plugins/maya/publish/validate_node_no_ghosting.py index 360c3cdce8..8f40628c61 100644 --- a/pype/plugins/maya/publish/validate_node_no_ghosting.py +++ b/pype/plugins/maya/publish/validate_node_no_ghosting.py @@ -1,8 +1,8 @@ from maya import cmds import pyblish.api -import colorbleed.api -import colorbleed.maya.action +import pype.api +import pype.maya.action class ValidateNodeNoGhosting(pyblish.api.InstancePlugin): @@ -17,11 +17,11 @@ class ValidateNodeNoGhosting(pyblish.api.InstancePlugin): """ - order = colorbleed.api.ValidateContentsOrder + order = pype.api.ValidateContentsOrder hosts = ['maya'] - families = ['colorbleed.model', 'colorbleed.rig'] + families = ['model', 'rig'] label = "No Ghosting" - actions = [colorbleed.maya.action.SelectInvalidAction] + actions = [pype.maya.action.SelectInvalidAction] _attributes = {'ghosting': 0} diff --git a/pype/plugins/maya/publish/validate_render_image_rule.py b/pype/plugins/maya/publish/validate_render_image_rule.py index c16b5ecc3a..762cf963f1 100644 --- a/pype/plugins/maya/publish/validate_render_image_rule.py +++ b/pype/plugins/maya/publish/validate_render_image_rule.py @@ -1,7 +1,7 @@ import maya.mel as mel import pyblish.api -import colorbleed.api +import pype.api def get_file_rule(rule): @@ -14,10 +14,10 @@ class ValidateRenderImageRule(pyblish.api.ContextPlugin): """ - order = colorbleed.api.ValidateContentsOrder + order = pype.api.ValidateContentsOrder label = "Images File Rule (Workspace)" hosts = ["maya"] - families = ["colorbleed.renderlayer"] + families = ["renderlayer"] def process(self, context): diff --git a/pype/plugins/maya/publish/validate_render_no_default_cameras.py b/pype/plugins/maya/publish/validate_render_no_default_cameras.py index fbfb50bd4e..439cfb69d3 100644 --- a/pype/plugins/maya/publish/validate_render_no_default_cameras.py +++ b/pype/plugins/maya/publish/validate_render_no_default_cameras.py @@ -1,18 +1,18 @@ from maya import cmds import pyblish.api -import colorbleed.api -import colorbleed.maya.action +import pype.api +import pype.maya.action class ValidateRenderNoDefaultCameras(pyblish.api.InstancePlugin): """Ensure no default (startup) cameras are to be rendered.""" - order = colorbleed.api.ValidateContentsOrder + order = pype.api.ValidateContentsOrder hosts = ['maya'] - families = ['colorbleed.renderlayer'] + families = ['renderlayer'] label = "No Default Cameras Renderable" - actions = [colorbleed.maya.action.SelectInvalidAction] + actions = [pype.maya.action.SelectInvalidAction] @staticmethod def get_invalid(instance): diff --git a/pype/plugins/maya/publish/validate_render_single_camera.py b/pype/plugins/maya/publish/validate_render_single_camera.py index 447f52beec..4321884815 100644 --- a/pype/plugins/maya/publish/validate_render_single_camera.py +++ b/pype/plugins/maya/publish/validate_render_single_camera.py @@ -1,6 +1,6 @@ import pyblish.api -import colorbleed.api -import colorbleed.maya.action +import pype.api +import pype.maya.action class ValidateRenderSingleCamera(pyblish.api.InstancePlugin): @@ -14,12 +14,12 @@ class ValidateRenderSingleCamera(pyblish.api.InstancePlugin): """ - order = colorbleed.api.ValidateContentsOrder + order = pype.api.ValidateContentsOrder label = "Render Single Camera" hosts = ['maya'] - families = ["colorbleed.renderlayer", - "colorbleed.vrayscene"] - actions = [colorbleed.maya.action.SelectInvalidAction] + families = ["renderlayer", + "vrayscene"] + actions = [pype.maya.action.SelectInvalidAction] def process(self, instance): """Process all the cameras in the instance""" diff --git a/pype/plugins/maya/publish/validate_renderlayer_aovs.py b/pype/plugins/maya/publish/validate_renderlayer_aovs.py index 06e0c68184..e14c92a8b4 100644 --- a/pype/plugins/maya/publish/validate_renderlayer_aovs.py +++ b/pype/plugins/maya/publish/validate_renderlayer_aovs.py @@ -1,8 +1,8 @@ import pyblish.api -import colorbleed.maya.action +import pype.maya.action from avalon import io -import colorbleed.api +import pype.api class ValidateRenderLayerAOVs(pyblish.api.InstancePlugin): @@ -24,8 +24,8 @@ class ValidateRenderLayerAOVs(pyblish.api.InstancePlugin): order = pyblish.api.ValidatorOrder + 0.1 label = "Render Passes / AOVs Are Registered" hosts = ["maya"] - families = ["colorbleed.renderlayer"] - actions = [colorbleed.maya.action.SelectInvalidAction] + families = ["renderlayer"] + actions = [pype.maya.action.SelectInvalidAction] def process(self, instance): invalid = self.get_invalid(instance) diff --git a/pype/plugins/maya/publish/validate_rendersettings.py b/pype/plugins/maya/publish/validate_rendersettings.py index 8f8c86e51e..3510826eca 100644 --- a/pype/plugins/maya/publish/validate_rendersettings.py +++ b/pype/plugins/maya/publish/validate_rendersettings.py @@ -1,8 +1,8 @@ import maya.cmds as cmds import pyblish.api -import colorbleed.api -import colorbleed.maya.lib as lib +import pype.api +import pype.maya.lib as lib class ValidateRenderSettings(pyblish.api.InstancePlugin): @@ -27,11 +27,11 @@ class ValidateRenderSettings(pyblish.api.InstancePlugin): """ - order = colorbleed.api.ValidateContentsOrder + order = pype.api.ValidateContentsOrder label = "Render Settings" hosts = ["maya"] - families = ["colorbleed.renderlayer"] - actions = [colorbleed.api.RepairAction] + families = ["renderlayer"] + actions = [pype.api.RepairAction] DEFAULT_PADDING = 4 RENDERER_PREFIX = {"vray": "/_/"} diff --git a/pype/plugins/maya/publish/validate_rig_contents.py b/pype/plugins/maya/publish/validate_rig_contents.py index 7530936a66..0a9616ba1f 100644 --- a/pype/plugins/maya/publish/validate_rig_contents.py +++ b/pype/plugins/maya/publish/validate_rig_contents.py @@ -1,7 +1,7 @@ from maya import cmds import pyblish.api -import colorbleed.api +import pype.api class ValidateRigContents(pyblish.api.InstancePlugin): @@ -13,10 +13,10 @@ class ValidateRigContents(pyblish.api.InstancePlugin): """ - order = colorbleed.api.ValidateContentsOrder + order = pype.api.ValidateContentsOrder label = "Rig Contents" hosts = ["maya"] - families = ["colorbleed.rig"] + families = ["rig"] accepted_output = ["mesh", "transform"] accepted_controllers = ["transform"] diff --git a/pype/plugins/maya/publish/validate_rig_controllers.py b/pype/plugins/maya/publish/validate_rig_controllers.py index ecb3b687d1..06746f2dbb 100644 --- a/pype/plugins/maya/publish/validate_rig_controllers.py +++ b/pype/plugins/maya/publish/validate_rig_controllers.py @@ -2,9 +2,9 @@ from maya import cmds import pyblish.api -import colorbleed.api -import colorbleed.maya.action -from colorbleed.maya.lib import undo_chunk +import pype.api +import pype.maya.action +from pype.maya.lib import undo_chunk class ValidateRigControllers(pyblish.api.InstancePlugin): @@ -25,12 +25,12 @@ class ValidateRigControllers(pyblish.api.InstancePlugin): - Break all incoming connections to keyable attributes """ - order = colorbleed.api.ValidateContentsOrder + 0.05 + order = pype.api.ValidateContentsOrder + 0.05 label = "Rig Controllers" hosts = ["maya"] - families = ["colorbleed.rig"] - actions = [colorbleed.api.RepairAction, - colorbleed.maya.action.SelectInvalidAction] + families = ["rig"] + actions = [pype.api.RepairAction, + pype.maya.action.SelectInvalidAction] # Default controller values CONTROLLER_DEFAULTS = { diff --git a/pype/plugins/maya/publish/validate_rig_controllers_arnold_attributes.py b/pype/plugins/maya/publish/validate_rig_controllers_arnold_attributes.py index 43bfde918f..525a15a4e5 100644 --- a/pype/plugins/maya/publish/validate_rig_controllers_arnold_attributes.py +++ b/pype/plugins/maya/publish/validate_rig_controllers_arnold_attributes.py @@ -1,10 +1,10 @@ from maya import cmds import pyblish.api -import colorbleed.api +import pype.api -import colorbleed.maya.lib as lib -import colorbleed.maya.action +import pype.maya.lib as lib +import pype.maya.action class ValidateRigControllersArnoldAttributes(pyblish.api.InstancePlugin): @@ -26,12 +26,12 @@ class ValidateRigControllersArnoldAttributes(pyblish.api.InstancePlugin): This validator will ensure they are hidden or unkeyable attributes. """ - order = colorbleed.api.ValidateContentsOrder + 0.05 + order = pype.api.ValidateContentsOrder + 0.05 label = "Rig Controllers (Arnold Attributes)" hosts = ["maya"] - families = ["colorbleed.rig"] - actions = [colorbleed.api.RepairAction, - colorbleed.maya.action.SelectInvalidAction] + families = ["rig"] + actions = [pype.api.RepairAction, + pype.maya.action.SelectInvalidAction] attributes = [ "rcurve", diff --git a/pype/plugins/maya/publish/validate_rig_out_set_node_ids.py b/pype/plugins/maya/publish/validate_rig_out_set_node_ids.py index 72e0db311c..3dde6bc83d 100644 --- a/pype/plugins/maya/publish/validate_rig_out_set_node_ids.py +++ b/pype/plugins/maya/publish/validate_rig_out_set_node_ids.py @@ -1,9 +1,9 @@ import maya.cmds as cmds import pyblish.api -import colorbleed.api -import colorbleed.maya.action -import colorbleed.maya.lib as lib +import pype.api +import pype.maya.action +import pype.maya.lib as lib class ValidateRigOutSetNodeIds(pyblish.api.InstancePlugin): @@ -16,11 +16,11 @@ class ValidateRigOutSetNodeIds(pyblish.api.InstancePlugin): """ - order = colorbleed.api.ValidateContentsOrder - families = ["colorbleed.rig"] + order = pype.api.ValidateContentsOrder + families = ["rig"] hosts = ['maya'] label = 'Rig Out Set Node Ids' - actions = [colorbleed.maya.action.SelectInvalidAction, colorbleed.api.RepairAction] + actions = [pype.maya.action.SelectInvalidAction, pype.api.RepairAction] def process(self, instance): """Process all meshes""" diff --git a/pype/plugins/maya/publish/validate_scene_set_workspace.py b/pype/plugins/maya/publish/validate_scene_set_workspace.py index ed37457164..778c7eae86 100644 --- a/pype/plugins/maya/publish/validate_scene_set_workspace.py +++ b/pype/plugins/maya/publish/validate_scene_set_workspace.py @@ -3,7 +3,7 @@ import os import maya.cmds as cmds import pyblish.api -import colorbleed.api +import pype.api def is_subdir(path, root_dir): @@ -28,7 +28,7 @@ def is_subdir(path, root_dir): class ValidateSceneSetWorkspace(pyblish.api.ContextPlugin): """Validate the scene is inside the currently set Maya workspace""" - order = colorbleed.api.ValidatePipelineOrder + order = pype.api.ValidatePipelineOrder hosts = ['maya'] category = 'scene' version = (0, 1, 0) diff --git a/pype/plugins/maya/publish/validate_setdress_namespaces.py b/pype/plugins/maya/publish/validate_setdress_namespaces.py index a8a28a10ca..0d3b75ca37 100644 --- a/pype/plugins/maya/publish/validate_setdress_namespaces.py +++ b/pype/plugins/maya/publish/validate_setdress_namespaces.py @@ -1,6 +1,6 @@ import pyblish.api -import colorbleed.api -import colorbleed.maya.action +import pype.api +import pype.maya.action class ValidateSetdressNamespaces(pyblish.api.InstancePlugin): @@ -17,8 +17,8 @@ class ValidateSetdressNamespaces(pyblish.api.InstancePlugin): label = "Validate Setdress Namespaces" order = pyblish.api.ValidatorOrder - families = ["colorbleed.setdress"] - actions = [colorbleed.maya.action.SelectInvalidAction] + families = ["setdress"] + actions = [pype.maya.action.SelectInvalidAction] def process(self, instance): diff --git a/pype/plugins/maya/publish/validate_setdress_transforms.py b/pype/plugins/maya/publish/validate_setdress_transforms.py index 8ed4a81b5f..918f4670be 100644 --- a/pype/plugins/maya/publish/validate_setdress_transforms.py +++ b/pype/plugins/maya/publish/validate_setdress_transforms.py @@ -1,9 +1,9 @@ import pyblish.api -import colorbleed.api +import pype.api from maya import cmds -import colorbleed.maya.action +import pype.maya.action class ValidateSetDressModelTransforms(pyblish.api.InstancePlugin): @@ -27,9 +27,9 @@ class ValidateSetDressModelTransforms(pyblish.api.InstancePlugin): order = pyblish.api.ValidatorOrder + 0.49 label = "Setdress Model Transforms" - families = ["colorbleed.setdress"] - actions = [colorbleed.maya.action.SelectInvalidAction, - colorbleed.api.RepairAction] + families = ["setdress"] + actions = [pype.maya.action.SelectInvalidAction, + pype.api.RepairAction] prompt_message = ("You are about to reset the matrix to the default values." " This can alter the look of your scene. " @@ -44,7 +44,7 @@ class ValidateSetDressModelTransforms(pyblish.api.InstancePlugin): @classmethod def get_invalid(cls, instance): - import colorbleed.maya.lib as lib + import pype.maya.lib as lib # Get all transforms in the loaded containers container_roots = cmds.listRelatives(instance.data["hierarchy"], @@ -89,7 +89,7 @@ class ValidateSetDressModelTransforms(pyblish.api.InstancePlugin): """ - import colorbleed.maya.lib as lib + import pype.maya.lib as lib from avalon.vendor.Qt import QtWidgets # Store namespace in variable, cosmetics thingy diff --git a/pype/plugins/maya/publish/validate_shape_default_names.py b/pype/plugins/maya/publish/validate_shape_default_names.py index b4249d69aa..9beb77872a 100644 --- a/pype/plugins/maya/publish/validate_shape_default_names.py +++ b/pype/plugins/maya/publish/validate_shape_default_names.py @@ -3,8 +3,8 @@ import re from maya import cmds import pyblish.api -import colorbleed.api -import colorbleed.maya.action +import pype.api +import pype.maya.action def short_name(node): @@ -31,15 +31,15 @@ class ValidateShapeDefaultNames(pyblish.api.InstancePlugin): """ - order = colorbleed.api.ValidateContentsOrder + order = pype.api.ValidateContentsOrder hosts = ['maya'] - families = ['colorbleed.model'] + families = ['model'] category = 'cleanup' optional = True version = (0, 1, 0) label = "Shape Default Naming" - actions = [colorbleed.maya.action.SelectInvalidAction, - colorbleed.api.RepairAction] + actions = [pype.maya.action.SelectInvalidAction, + pype.api.RepairAction] @staticmethod def _define_default_name(shape): diff --git a/pype/plugins/maya/publish/validate_shape_render_stats.py b/pype/plugins/maya/publish/validate_shape_render_stats.py index 544470c3a7..b803cd366b 100644 --- a/pype/plugins/maya/publish/validate_shape_render_stats.py +++ b/pype/plugins/maya/publish/validate_shape_render_stats.py @@ -1,20 +1,20 @@ import pyblish.api -import colorbleed.api +import pype.api from maya import cmds -import colorbleed.maya.action +import pype.maya.action class ValidateShapeRenderStats(pyblish.api.Validator): """Ensure all render stats are set to the default values.""" - order = colorbleed.api.ValidateMeshOrder + order = pype.api.ValidateMeshOrder hosts = ['maya'] - families = ['colorbleed.model'] + families = ['model'] label = 'Shape Default Render Stats' - actions = [colorbleed.maya.action.SelectInvalidAction, - colorbleed.api.RepairAction] + actions = [pype.maya.action.SelectInvalidAction, + pype.api.RepairAction] defaults = {'castsShadows': 1, 'receiveShadows': 1, diff --git a/pype/plugins/maya/publish/validate_single_assembly.py b/pype/plugins/maya/publish/validate_single_assembly.py index 886e88ada3..b2cf6abbb4 100644 --- a/pype/plugins/maya/publish/validate_single_assembly.py +++ b/pype/plugins/maya/publish/validate_single_assembly.py @@ -1,5 +1,5 @@ import pyblish.api -import colorbleed.api +import pype.api class ValidateSingleAssembly(pyblish.api.InstancePlugin): @@ -17,9 +17,9 @@ class ValidateSingleAssembly(pyblish.api.InstancePlugin): """ - order = colorbleed.api.ValidateContentsOrder + order = pype.api.ValidateContentsOrder hosts = ['maya'] - families = ['colorbleed.rig', 'colorbleed.animation'] + families = ['rig', 'animation'] label = 'Single Assembly' def process(self, instance): diff --git a/pype/plugins/maya/publish/validate_skinCluster_deformer_set.py b/pype/plugins/maya/publish/validate_skinCluster_deformer_set.py index 61ccb8f29a..71f7eea31b 100644 --- a/pype/plugins/maya/publish/validate_skinCluster_deformer_set.py +++ b/pype/plugins/maya/publish/validate_skinCluster_deformer_set.py @@ -1,8 +1,8 @@ from maya import cmds import pyblish.api -import colorbleed.api -import colorbleed.maya.action +import pype.api +import pype.maya.action class ValidateSkinclusterDeformerSet(pyblish.api.InstancePlugin): @@ -14,11 +14,11 @@ class ValidateSkinclusterDeformerSet(pyblish.api.InstancePlugin): """ - order = colorbleed.api.ValidateContentsOrder + order = pype.api.ValidateContentsOrder hosts = ['maya'] - families = ['colorbleed.fbx'] + families = ['fbx'] label = "Skincluster Deformer Relationships" - actions = [colorbleed.maya.action.SelectInvalidAction] + actions = [pype.maya.action.SelectInvalidAction] def process(self, instance): """Process all the transform nodes in the instance""" diff --git a/pype/plugins/maya/publish/validate_step_size.py b/pype/plugins/maya/publish/validate_step_size.py index 07d61ec933..20207a050f 100644 --- a/pype/plugins/maya/publish/validate_step_size.py +++ b/pype/plugins/maya/publish/validate_step_size.py @@ -1,6 +1,6 @@ import pyblish.api -import colorbleed.api -import colorbleed.maya.action +import pype.api +import pype.maya.action class ValidateStepSize(pyblish.api.InstancePlugin): @@ -10,12 +10,12 @@ class ValidateStepSize(pyblish.api.InstancePlugin): """ - order = colorbleed.api.ValidateContentsOrder + order = pype.api.ValidateContentsOrder label = 'Step size' - families = ['colorbleed.camera', - 'colorbleed.pointcache', - 'colorbleed.animation'] - actions = [colorbleed.maya.action.SelectInvalidAction] + families = ['camera', + 'pointcache', + 'animation'] + actions = [pype.maya.action.SelectInvalidAction] MIN = 0.01 MAX = 1.0 diff --git a/pype/plugins/maya/publish/validate_transfers.py b/pype/plugins/maya/publish/validate_transfers.py index d1ea7d362e..3234b2240e 100644 --- a/pype/plugins/maya/publish/validate_transfers.py +++ b/pype/plugins/maya/publish/validate_transfers.py @@ -1,5 +1,5 @@ import pyblish.api -import colorbleed.api +import pype.api import os from collections import defaultdict @@ -13,7 +13,7 @@ class ValidateTransfers(pyblish.api.InstancePlugin): """ - order = colorbleed.api.ValidateContentsOrder + order = pype.api.ValidateContentsOrder label = "Transfers" def process(self, instance): diff --git a/pype/plugins/maya/publish/validate_transform_naming_suffix.py b/pype/plugins/maya/publish/validate_transform_naming_suffix.py index 0c100126ce..0adba9b656 100644 --- a/pype/plugins/maya/publish/validate_transform_naming_suffix.py +++ b/pype/plugins/maya/publish/validate_transform_naming_suffix.py @@ -1,8 +1,8 @@ from maya import cmds import pyblish.api -import colorbleed.api -import colorbleed.maya.action +import pype.api +import pype.maya.action SUFFIX_NAMING_TABLE = {'mesh': ["_GEO", "_GES", "_GEP", "_OSD"], 'nurbsCurve': ["_CRV"], @@ -31,14 +31,14 @@ class ValidateTransformNamingSuffix(pyblish.api.InstancePlugin): """ - order = colorbleed.api.ValidateContentsOrder + order = pype.api.ValidateContentsOrder hosts = ['maya'] - families = ['colorbleed.model'] + families = ['model'] category = 'cleanup' optional = True version = (0, 1, 0) label = 'Suffix Naming Conventions' - actions = [colorbleed.maya.action.SelectInvalidAction] + actions = [pype.maya.action.SelectInvalidAction] @staticmethod def is_valid_name(node_name, shape_type): diff --git a/pype/plugins/maya/publish/validate_transform_zero.py b/pype/plugins/maya/publish/validate_transform_zero.py index 895248933c..0d2c3beade 100644 --- a/pype/plugins/maya/publish/validate_transform_zero.py +++ b/pype/plugins/maya/publish/validate_transform_zero.py @@ -1,8 +1,8 @@ from maya import cmds import pyblish.api -import colorbleed.api -import colorbleed.maya.action +import pype.api +import pype.maya.action class ValidateTransformZero(pyblish.api.Validator): @@ -14,13 +14,13 @@ class ValidateTransformZero(pyblish.api.Validator): """ - order = colorbleed.api.ValidateContentsOrder + order = pype.api.ValidateContentsOrder hosts = ["maya"] - families = ["colorbleed.model"] + families = ["model"] category = "geometry" version = (0, 1, 0) label = "Transform Zero (Freeze)" - actions = [colorbleed.maya.action.SelectInvalidAction] + actions = [pype.maya.action.SelectInvalidAction] _identity = [1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, diff --git a/pype/plugins/maya/publish/validate_vray_distributed_rendering.py b/pype/plugins/maya/publish/validate_vray_distributed_rendering.py index 632fd2964e..cccf966ffd 100644 --- a/pype/plugins/maya/publish/validate_vray_distributed_rendering.py +++ b/pype/plugins/maya/publish/validate_vray_distributed_rendering.py @@ -1,6 +1,6 @@ import pyblish.api -import colorbleed.api -import colorbleed.maya.lib as lib +import pype.api +import pype.maya.lib as lib from maya import cmds @@ -15,10 +15,10 @@ class ValidateVRayDistributedRendering(pyblish.api.InstancePlugin): """ - order = colorbleed.api.ValidateContentsOrder + order = pype.api.ValidateContentsOrder label = "VRay Distributed Rendering" - families = ["colorbleed.renderlayer"] - actions = [colorbleed.api.RepairAction] + families = ["renderlayer"] + actions = [pype.api.RepairAction] # V-Ray attribute names enabled_attr = "vraySettings.sys_distributed_rendering_on" diff --git a/pype/plugins/maya/publish/validate_vray_translator_settings.py b/pype/plugins/maya/publish/validate_vray_translator_settings.py index 0de41c9563..493febf49a 100644 --- a/pype/plugins/maya/publish/validate_vray_translator_settings.py +++ b/pype/plugins/maya/publish/validate_vray_translator_settings.py @@ -1,16 +1,16 @@ import pyblish.api -import colorbleed.api -from colorbleed.plugin import contextplugin_should_run +import pype.api +from pype.plugin import contextplugin_should_run from maya import cmds class ValidateVRayTranslatorEnabled(pyblish.api.ContextPlugin): - order = colorbleed.api.ValidateContentsOrder + order = pype.api.ValidateContentsOrder label = "VRay Translator Settings" - families = ["colorbleed.vrayscene"] - actions = [colorbleed.api.RepairContextAction] + families = ["vrayscene"] + actions = [pype.api.RepairContextAction] def process(self, context): diff --git a/pype/plugins/maya/publish/validate_vrayproxy_members.py b/pype/plugins/maya/publish/validate_vrayproxy_members.py index 7d9ecdaac5..9cc18e2199 100644 --- a/pype/plugins/maya/publish/validate_vrayproxy_members.py +++ b/pype/plugins/maya/publish/validate_vrayproxy_members.py @@ -1,9 +1,9 @@ import pyblish.api -import colorbleed.api +import pype.api from maya import cmds -import colorbleed.maya.action +import pype.maya.action class ValidateVrayProxyMembers(pyblish.api.InstancePlugin): @@ -12,8 +12,8 @@ class ValidateVrayProxyMembers(pyblish.api.InstancePlugin): order = pyblish.api.ValidatorOrder label = 'VRay Proxy Members' hosts = ['maya'] - families = ['colorbleed.vrayproxy'] - actions = [colorbleed.maya.action.SelectInvalidAction] + families = ['vrayproxy'] + actions = [pype.maya.action.SelectInvalidAction] def process(self, instance): diff --git a/pype/plugins/maya/publish/validate_yeti_renderscript_callbacks.py b/pype/plugins/maya/publish/validate_yeti_renderscript_callbacks.py index 8864637da2..cd9b0754b3 100644 --- a/pype/plugins/maya/publish/validate_yeti_renderscript_callbacks.py +++ b/pype/plugins/maya/publish/validate_yeti_renderscript_callbacks.py @@ -1,7 +1,7 @@ from maya import cmds import pyblish.api -import colorbleed.api +import pype.api class ValidateYetiRenderScriptCallbacks(pyblish.api.InstancePlugin): @@ -20,10 +20,10 @@ class ValidateYetiRenderScriptCallbacks(pyblish.api.InstancePlugin): """ - order = colorbleed.api.ValidateContentsOrder + order = pype.api.ValidateContentsOrder label = "Yeti Render Script Callbacks" hosts = ["maya"] - families = ["colorbleed.renderlayer"] + families = ["renderlayer"] # Settings per renderer callbacks = { diff --git a/pype/plugins/maya/publish/validate_yeti_rig_input_in_instance.py b/pype/plugins/maya/publish/validate_yeti_rig_input_in_instance.py index 423cc18360..51872d04e1 100644 --- a/pype/plugins/maya/publish/validate_yeti_rig_input_in_instance.py +++ b/pype/plugins/maya/publish/validate_yeti_rig_input_in_instance.py @@ -1,18 +1,18 @@ from maya import cmds import pyblish.api -import colorbleed.api -import colorbleed.maya.action +import pype.api +import pype.maya.action class ValidateYetiRigInputShapesInInstance(pyblish.api.Validator): """Validate if all input nodes are part of the instance's hierarchy""" - order = colorbleed.api.ValidateContentsOrder + order = pype.api.ValidateContentsOrder hosts = ["maya"] - families = ["colorbleed.yetiRig"] + families = ["yetiRig"] label = "Yeti Rig Input Shapes In Instance" - actions = [colorbleed.maya.action.SelectInvalidAction] + actions = [pype.maya.action.SelectInvalidAction] def process(self, instance): diff --git a/pype/plugins/maya/publish/validate_yeti_rig_settings.py b/pype/plugins/maya/publish/validate_yeti_rig_settings.py index 90ddfafa45..9914277721 100644 --- a/pype/plugins/maya/publish/validate_yeti_rig_settings.py +++ b/pype/plugins/maya/publish/validate_yeti_rig_settings.py @@ -12,7 +12,7 @@ class ValidateYetiRigSettings(pyblish.api.InstancePlugin): order = pyblish.api.ValidatorOrder label = "Yeti Rig Settings" - families = ["colorbleed.yetiRig"] + families = ["yetiRig"] def process(self, instance): diff --git a/pype/plugins/maya/publish/validate_yetirig_cache_state.py b/pype/plugins/maya/publish/validate_yetirig_cache_state.py index 94a46d2821..405aeb3fd7 100644 --- a/pype/plugins/maya/publish/validate_yetirig_cache_state.py +++ b/pype/plugins/maya/publish/validate_yetirig_cache_state.py @@ -1,10 +1,10 @@ import pyblish.api -import colorbleed.action +import pype.action import maya.cmds as cmds -import colorbleed.maya.action +import pype.maya.action class ValidateYetiRigCacheState(pyblish.api.InstancePlugin): @@ -19,9 +19,9 @@ class ValidateYetiRigCacheState(pyblish.api.InstancePlugin): order = pyblish.api.ValidatorOrder label = "Yeti Rig Cache State" hosts = ["maya"] - families = ["colorbleed.yetiRig"] - actions = [colorbleed.action.RepairAction, - colorbleed.maya.action.SelectInvalidAction] + families = ["yetiRig"] + actions = [pype.action.RepairAction, + pype.maya.action.SelectInvalidAction] def process(self, instance): invalid = self.get_invalid(instance) diff --git a/pype/scripts/fusion_switch_shot.py b/pype/scripts/fusion_switch_shot.py index 4254d6c4ce..92271a3b7c 100644 --- a/pype/scripts/fusion_switch_shot.py +++ b/pype/scripts/fusion_switch_shot.py @@ -8,8 +8,8 @@ from avalon import api, io, pipeline import avalon.fusion # Config imports -import colorbleed.lib as colorbleed -import colorbleed.fusion.lib as fusion_lib +import pype.lib as pype +import pype.fusion.lib as fusion_lib log = logging.getLogger("Update Slap Comp") @@ -87,7 +87,7 @@ def _format_filepath(session): # Create new unqiue filepath if os.path.exists(new_filepath): - new_filepath = colorbleed.version_up(new_filepath) + new_filepath = pype.version_up(new_filepath) return new_filepath @@ -189,7 +189,7 @@ def switch(asset_name, filepath=None, new=True): representations = [] for container in containers: try: - representation = colorbleed.switch_item(container, + representation = pype.switch_item(container, asset_name=asset_name) representations.append(representation) except Exception as e: @@ -209,7 +209,7 @@ def switch(asset_name, filepath=None, new=True): # Update savers output based on new session _update_savers(current_comp, switch_to_session) else: - comp_path = colorbleed.version_up(filepath) + comp_path = pype.version_up(filepath) current_comp.Print(comp_path) diff --git a/pype/setdress_api.py b/pype/setdress_api.py index bc6c67aacc..c6de0a4f74 100644 --- a/pype/setdress_api.py +++ b/pype/setdress_api.py @@ -10,7 +10,7 @@ from maya import cmds from avalon import api import avalon.io as io from avalon.maya.lib import unique_namespace -from colorbleed.maya.lib import matrix_equals +from pype.maya.lib import matrix_equals log = logging.getLogger("PackageLoader") @@ -137,7 +137,7 @@ def load_package(filepath, name, namespace=None): # manager # for container in containers: # cmds.setAttr("%s.id" % container, - # "colorbleed.setdress.container", + # "setdress.container", # type="string") # TODO: Lock all loaded nodes @@ -162,7 +162,7 @@ def _add(instance, representation_id, loaders, namespace, root="|"): """ - from colorbleed.maya.lib import get_container_transforms + from pype.maya.lib import get_container_transforms # Process within the namespace with namespaced(namespace, new=False) as namespace: @@ -359,7 +359,7 @@ def update_scene(set_container, containers, current_data, new_data, new_file): """ - from colorbleed.maya.lib import DEFAULT_MATRIX, get_container_transforms + from pype.maya.lib import DEFAULT_MATRIX, get_container_transforms set_namespace = set_container['namespace']