From eb9936b487e0ea439ff6e9144cce5890d38e320e Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Tue, 2 Oct 2018 23:35:35 +0200 Subject: [PATCH] family names cut of 'studio.' --- pype/fusion/__init__.py | 6 ++--- pype/lib.py | 2 +- pype/maya/__init__.py | 2 +- pype/maya/lib.py | 2 +- pype/maya/menu.py | 2 +- pype/nuke/__init__.py | 6 ++--- .../fusion/create/create_tiff_saver.py | 2 +- pype/plugins/fusion/load/actions.py | 20 ++++++++--------- pype/plugins/fusion/load/load_sequence.py | 2 +- .../fusion/publish/collect_instances.py | 4 ++-- .../fusion/publish/collect_render_target.py | 8 +++---- .../increment_current_file_deadline.py | 2 +- .../fusion/publish/publish_image_sequences.py | 4 ++-- pype/plugins/fusion/publish/render_local.py | 2 +- pype/plugins/fusion/publish/save_scene.py | 2 +- .../plugins/fusion/publish/submit_deadline.py | 2 +- .../publish/validate_background_depth.py | 2 +- .../fusion/publish/validate_comp_saved.py | 2 +- .../publish/validate_create_folder_checked.py | 2 +- .../validate_filename_has_extension.py | 2 +- .../publish/validate_saver_has_input.py | 2 +- .../publish/validate_saver_passthrough.py | 2 +- .../fusion/publish/validate_unique_subsets.py | 2 +- .../plugins/global/load/open_imagesequence.py | 2 +- .../global/publish/collect_deadline_user.py | 2 +- .../global/publish/collect_filesequences.py | 2 +- pype/plugins/global/publish/integrate.py | 22 +++++++++---------- .../global/publish/submit_publish_job.py | 6 ++--- .../publish/validate_sequence_frames.py | 2 +- .../maya/create/colorbleed_animation.py | 2 +- pype/plugins/maya/create/colorbleed_camera.py | 2 +- pype/plugins/maya/create/colorbleed_look.py | 2 +- pype/plugins/maya/create/colorbleed_model.py | 2 +- .../maya/create/colorbleed_pointcache.py | 2 +- .../maya/create/colorbleed_renderglobals.py | 2 +- pype/plugins/maya/create/colorbleed_rig.py | 2 +- .../maya/create/colorbleed_setdress.py | 2 +- .../maya/create/colorbleed_vrayproxy.py | 2 +- .../maya/create/colorbleed_yeti_cache.py | 2 +- .../maya/create/colorbleed_yeti_rig.py | 2 +- pype/plugins/maya/load/_load_animation.py | 6 ++--- pype/plugins/maya/load/actions.py | 12 +++++----- pype/plugins/maya/load/load_alembic.py | 4 ++-- pype/plugins/maya/load/load_camera.py | 2 +- pype/plugins/maya/load/load_look.py | 2 +- pype/plugins/maya/load/load_model.py | 4 ++-- pype/plugins/maya/load/load_rig.py | 4 ++-- pype/plugins/maya/load/load_setdress.py | 2 +- pype/plugins/maya/load/load_vrayproxy.py | 2 +- pype/plugins/maya/load/load_yeti_cache.py | 2 +- pype/plugins/maya/load/load_yeti_rig.py | 2 +- .../plugins/maya/publish/collect_animation.py | 2 +- pype/plugins/maya/publish/collect_history.py | 2 +- pype/plugins/maya/publish/collect_look.py | 2 +- pype/plugins/maya/publish/collect_model.py | 2 +- .../maya/publish/collect_render_layer_aovs.py | 2 +- .../maya/publish/collect_renderlayers.py | 2 +- pype/plugins/maya/publish/collect_setdress.py | 2 +- .../maya/publish/collect_yeti_cache.py | 2 +- pype/plugins/maya/publish/collect_yeti_rig.py | 2 +- .../plugins/maya/publish/extract_animation.py | 2 +- .../maya/publish/extract_camera_alembic.py | 2 +- .../maya/publish/extract_camera_mayaAscii.py | 2 +- pype/plugins/maya/publish/extract_look.py | 2 +- pype/plugins/maya/publish/extract_model.py | 2 +- .../maya/publish/extract_pointcache.py | 4 ++-- pype/plugins/maya/publish/extract_rig.py | 2 +- pype/plugins/maya/publish/extract_setdress.py | 2 +- .../plugins/maya/publish/extract_vrayproxy.py | 2 +- .../maya/publish/extract_yeti_cache.py | 2 +- pype/plugins/maya/publish/extract_yeti_rig.py | 2 +- .../increment_current_file_deadline.py | 2 +- pype/plugins/maya/publish/save_scene.py | 2 +- pype/plugins/maya/publish/submit_deadline.py | 2 +- .../publish/validate_animation_content.py | 2 +- ...date_animation_out_set_related_node_ids.py | 2 +- .../publish/validate_deadline_connection.py | 2 +- .../maya/publish/validate_frame_range.py | 8 +++---- .../maya/publish/validate_model_content.py | 2 +- .../maya/publish/validate_no_animation.py | 2 +- .../maya/publish/validate_no_vraymesh.py | 2 +- .../plugins/maya/publish/validate_node_ids.py | 12 +++++----- .../maya/publish/validate_node_ids_related.py | 6 ++--- .../maya/publish/validate_node_ids_unique.py | 6 ++--- .../publish/validate_render_image_rule.py | 2 +- .../maya/publish/validate_renderlayer_aovs.py | 2 +- .../maya/publish/validate_rendersettings.py | 2 +- .../maya/publish/validate_rig_contents.py | 2 +- .../maya/publish/validate_rig_controllers.py | 2 +- ...idate_rig_controllers_arnold_attributes.py | 2 +- .../publish/validate_rig_out_set_node_ids.py | 2 +- .../publish/validate_setdress_namespaces.py | 2 +- .../publish/validate_setdress_transforms.py | 2 +- .../maya/publish/validate_transform_zero.py | 2 +- .../validate_yeti_rig_input_in_instance.py | 2 +- .../publish/validate_yetirig_cache_state.py | 2 +- pype/plugins/nuke/create/CrateWriteExr.py | 2 +- pype/plugins/nuke/load/actions.py | 20 ++++++++--------- pype/plugins/nuke/load/load_sequence.py | 2 +- pype/setdress_api.py | 2 +- 100 files changed, 162 insertions(+), 162 deletions(-) diff --git a/pype/fusion/__init__.py b/pype/fusion/__init__.py index b7b4b2d507..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 = ["studio.imagesequence", - "studio.camera", - "studio.pointcache"] + family_states = ["imagesequence", + "camera", + "pointcache"] avalon.data["familiesStateDefault"] = False avalon.data["familiesStateToggled"] = family_states diff --git a/pype/lib.py b/pype/lib.py index 187089b6f1..4ddc03bd17 100644 --- a/pype/lib.py +++ b/pype/lib.py @@ -243,7 +243,7 @@ def collect_container_metadata(container): """ # TODO: Improve method of getting the host lib module host_name = _get_host_name() - package_name = "studio.{}.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 feaeba52eb..40dc2b072a 100644 --- a/pype/maya/__init__.py +++ b/pype/maya/__init__.py @@ -43,7 +43,7 @@ def install(): override_event("taskChanged", on_task_changed) log.info("Setting default family states for loader..") - avalon.data["familiesStateToggled"] = ["studio.imagesequence"] + avalon.data["familiesStateToggled"] = ["imagesequence"] def uninstall(): diff --git a/pype/maya/lib.py b/pype/maya/lib.py index 0ae1852f4a..8fe0e8e248 100644 --- a/pype/maya/lib.py +++ b/pype/maya/lib.py @@ -1039,7 +1039,7 @@ def assign_look(nodes, subset="lookDefault"): version = io.find_one({"parent": subset_data['_id'], "type": "version", "data.families": - {"$in": ["studio.look"]} + {"$in": ["look"]} }, sort=[("name", -1)], projection={"_id": True, "name": True}) diff --git a/pype/maya/menu.py b/pype/maya/menu.py index 7c658d58c7..97a8799570 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 = "pype_setup" +self._menu = "pype" log = logging.getLogger(__name__) diff --git a/pype/nuke/__init__.py b/pype/nuke/__init__.py index 9e6721cb15..33bc2a5a84 100644 --- a/pype/nuke/__init__.py +++ b/pype/nuke/__init__.py @@ -23,9 +23,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 = ["studio.imagesequence", - "studio.camera", - "studio.pointcache"] + family_states = ["imagesequence", + "camera", + "pointcache"] avalon.data["familiesStateDefault"] = False avalon.data["familiesStateToggled"] = family_states diff --git a/pype/plugins/fusion/create/create_tiff_saver.py b/pype/plugins/fusion/create/create_tiff_saver.py index 4baddfc36e..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 = "studio.saver" + family = "saver" def process(self): diff --git a/pype/plugins/fusion/load/actions.py b/pype/plugins/fusion/load/actions.py index 9c83f6ba79..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 = ["studio.animation", - "studio.camera", - "studio.imagesequence", - "studio.yeticache", - "studio.pointcache"] + families = ["animation", + "camera", + "imagesequence", + "yeticache", + "pointcache"] representations = ["*"] label = "Set frame range" @@ -41,11 +41,11 @@ class FusionSetFrameRangeLoader(api.Loader): class FusionSetFrameRangeWithHandlesLoader(api.Loader): """Specific loader of Alembic for the avalon.animation family""" - families = ["studio.animation", - "studio.camera", - "studio.imagesequence", - "studio.yeticache", - "studio.pointcache"] + families = ["animation", + "camera", + "imagesequence", + "yeticache", + "pointcache"] representations = ["*"] label = "Set frame range (with handles)" diff --git a/pype/plugins/fusion/load/load_sequence.py b/pype/plugins/fusion/load/load_sequence.py index 2150bd1eb0..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 = ["studio.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 9177f603c3..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": ["studio.saver"], - "family": "studio.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 0abdd7113f..df0a3bbe75 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("studio.rendermode") + comp.GetData("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 = ["studio.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("studio.rendermode") or "renderlocal" + rendermode = comp.GetData("rendermode") or "renderlocal" assert rendermode in options, "Must be supported render mode" self.log.info("Render mode: {0}".format(rendermode)) # Append family - family = "studio.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 f78cd34eb1..6545d84da3 100644 --- a/pype/plugins/fusion/publish/increment_current_file_deadline.py +++ b/pype/plugins/fusion/publish/increment_current_file_deadline.py @@ -11,7 +11,7 @@ class FusionIncrementCurrentFile(pyblish.api.ContextPlugin): label = "Increment current file" order = pyblish.api.IntegratorOrder + 9.0 hosts = ["fusion"] - families = ["studio.saver.deadline"] + families = ["saver.deadline"] optional = True def process(self, context): diff --git a/pype/plugins/fusion/publish/publish_image_sequences.py b/pype/plugins/fusion/publish/publish_image_sequences.py index 3078a2af62..26ae74676f 100644 --- a/pype/plugins/fusion/publish/publish_image_sequences.py +++ b/pype/plugins/fusion/publish/publish_image_sequences.py @@ -32,7 +32,7 @@ class PublishImageSequence(pyblish.api.InstancePlugin): order = pyblish.api.IntegratorOrder label = "Publish Rendered Image Sequence(s)" hosts = ["fusion"] - families = ["studio.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": ["studio.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 d34f7d56ee..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 = ["studio.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 ffc44b98d5..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 = ["studio.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 cce9b1292c..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 = ["studio.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 cdb5305c6c..c339d0137f 100644 --- a/pype/plugins/fusion/publish/validate_background_depth.py +++ b/pype/plugins/fusion/publish/validate_background_depth.py @@ -10,7 +10,7 @@ class ValidateBackgroundDepth(pyblish.api.InstancePlugin): label = "Validate Background Depth 32 bit" actions = [action.RepairAction] hosts = ["fusion"] - families = ["studio.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 6c94d730ce..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 = ["studio.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 78ce441745..d48875143d 100644 --- a/pype/plugins/fusion/publish/validate_create_folder_checked.py +++ b/pype/plugins/fusion/publish/validate_create_folder_checked.py @@ -13,7 +13,7 @@ class ValidateCreateFolderChecked(pyblish.api.InstancePlugin): order = pyblish.api.ValidatorOrder actions = [action.RepairAction] label = "Validate Create Folder Checked" - families = ["studio.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 40f167765d..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 = ["studio.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 9e94f101a0..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 = ["studio.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 c69873c04d..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 = ["studio.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 4fef26c9e9..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 = ["studio.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 350ae2a6b1..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 = ["studio.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 f90487e6e9..d5942e6eff 100644 --- a/pype/plugins/global/publish/collect_deadline_user.py +++ b/pype/plugins/global/publish/collect_deadline_user.py @@ -35,7 +35,7 @@ class CollectDeadlineUser(pyblish.api.ContextPlugin): order = pyblish.api.CollectorOrder + 0.499 label = "Deadline User" hosts = ['maya', 'fusion'] - families = ["studio.renderlayer", "studio.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 e2564a9918..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", ["studio.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 3e16454d8e..141b492f59 100644 --- a/pype/plugins/global/publish/integrate.py +++ b/pype/plugins/global/publish/integrate.py @@ -23,18 +23,18 @@ class IntegrateAsset(pyblish.api.InstancePlugin): label = "Integrate Asset" order = pyblish.api.IntegratorOrder - families = ["studio.animation", - "studio.camera", - "studio.imagesequence", - "studio.look", + families = ["animation", + "camera", + "imagesequence", + "look", "pype.mayaAscii", - "studio.model", - "studio.pointcache", - "studio.setdress", - "studio.rig", - "studio.vrayproxy", - "studio.yetiRig", - "studio.yeticache"] + "model", + "pointcache", + "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 6b9cca5177..63b201d8f1 100644 --- a/pype/plugins/global/publish/submit_publish_job.py +++ b/pype/plugins/global/publish/submit_publish_job.py @@ -123,7 +123,7 @@ class SubmitDependentImageSequenceJobDeadline(pyblish.api.InstancePlugin): label = "Submit image sequence jobs to Deadline" order = pyblish.api.IntegratorOrder + 0.1 hosts = ["fusion", "maya"] - families = ["studio.saver.deadline", "studio.renderlayer"] + families = ["saver.deadline", "renderlayer"] def process(self, instance): @@ -168,7 +168,7 @@ class SubmitDependentImageSequenceJobDeadline(pyblish.api.InstancePlugin): "regex": regex, "startFrame": start, "endFrame": end, - "families": ["studio.imagesequence"], + "families": ["imagesequence"], # Optional metadata (for debugging) "metadata": { @@ -185,7 +185,7 @@ class SubmitDependentImageSequenceJobDeadline(pyblish.api.InstancePlugin): if data.get("extendFrames", False): - family = "studio.imagesequence" + family = "imagesequence" override = data["overrideExistingFrame"] # override = data.get("overrideExistingFrame", False) diff --git a/pype/plugins/global/publish/validate_sequence_frames.py b/pype/plugins/global/publish/validate_sequence_frames.py index 1258050394..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 = ["studio.imagesequence"] + families = ["imagesequence"] hosts = ["shell"] def process(self, instance): diff --git a/pype/plugins/maya/create/colorbleed_animation.py b/pype/plugins/maya/create/colorbleed_animation.py index a5574dec18..ea8e8ebb39 100644 --- a/pype/plugins/maya/create/colorbleed_animation.py +++ b/pype/plugins/maya/create/colorbleed_animation.py @@ -9,7 +9,7 @@ class CreateAnimation(avalon.maya.Creator): name = "animationDefault" label = "Animation" - family = "studio.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 a30e202722..7f954c2461 100644 --- a/pype/plugins/maya/create/colorbleed_camera.py +++ b/pype/plugins/maya/create/colorbleed_camera.py @@ -8,7 +8,7 @@ class CreateCamera(avalon.maya.Creator): name = "cameraDefault" label = "Camera" - family = "studio.camera" + family = "camera" icon = "video-camera" def __init__(self, *args, **kwargs): diff --git a/pype/plugins/maya/create/colorbleed_look.py b/pype/plugins/maya/create/colorbleed_look.py index a3f4574658..17e8bcd7e3 100644 --- a/pype/plugins/maya/create/colorbleed_look.py +++ b/pype/plugins/maya/create/colorbleed_look.py @@ -8,7 +8,7 @@ class CreateLook(avalon.maya.Creator): name = "look" label = "Look" - family = "studio.look" + family = "look" icon = "paint-brush" def __init__(self, *args, **kwargs): diff --git a/pype/plugins/maya/create/colorbleed_model.py b/pype/plugins/maya/create/colorbleed_model.py index 4d321a444e..2573241107 100644 --- a/pype/plugins/maya/create/colorbleed_model.py +++ b/pype/plugins/maya/create/colorbleed_model.py @@ -6,5 +6,5 @@ class CreateModel(avalon.maya.Creator): name = "modelDefault" label = "Model" - family = "studio.model" + family = "model" icon = "cube" diff --git a/pype/plugins/maya/create/colorbleed_pointcache.py b/pype/plugins/maya/create/colorbleed_pointcache.py index eacec62c51..a660485e94 100644 --- a/pype/plugins/maya/create/colorbleed_pointcache.py +++ b/pype/plugins/maya/create/colorbleed_pointcache.py @@ -9,7 +9,7 @@ class CreatePointCache(avalon.maya.Creator): name = "pointcache" label = "Point Cache" - family = "studio.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 938ec9edea..ca086f1f47 100644 --- a/pype/plugins/maya/create/colorbleed_renderglobals.py +++ b/pype/plugins/maya/create/colorbleed_renderglobals.py @@ -10,7 +10,7 @@ from avalon import api class CreateRenderGlobals(avalon.maya.Creator): label = "Render Globals" - family = "studio.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 471219c6ef..e8bcd2baa2 100644 --- a/pype/plugins/maya/create/colorbleed_rig.py +++ b/pype/plugins/maya/create/colorbleed_rig.py @@ -8,7 +8,7 @@ class CreateRig(avalon.maya.Creator): name = "rigDefault" label = "Rig" - family = "studio.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 56c1129a82..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 = "studio.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 8153a29c0c..ea441a3e02 100644 --- a/pype/plugins/maya/create/colorbleed_vrayproxy.py +++ b/pype/plugins/maya/create/colorbleed_vrayproxy.py @@ -8,7 +8,7 @@ class CreateVrayProxy(avalon.maya.Creator): name = "vrayproxy" label = "VRay Proxy" - family = "studio.vrayproxy" + family = "vrayproxy" icon = "gears" 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 9c0897052b..36f1869ec5 100644 --- a/pype/plugins/maya/create/colorbleed_yeti_cache.py +++ b/pype/plugins/maya/create/colorbleed_yeti_cache.py @@ -9,7 +9,7 @@ class CreateYetiCache(avalon.maya.Creator): name = "yetiDefault" label = "Yeti Cache" - family = "studio.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 b0c9e1cece..ba44c7bf27 100644 --- a/pype/plugins/maya/create/colorbleed_yeti_rig.py +++ b/pype/plugins/maya/create/colorbleed_yeti_rig.py @@ -7,7 +7,7 @@ class CreateYetiRig(avalon.maya.Creator): """Output for procedural plugin nodes ( Yeti / XGen / etc)""" label = "Yeti Rig" - family = "studio.yetiRig" + family = "yetiRig" icon = "usb" def process(self): diff --git a/pype/plugins/maya/load/_load_animation.py b/pype/plugins/maya/load/_load_animation.py index 765243e8ea..bfb09a2c14 100644 --- a/pype/plugins/maya/load/_load_animation.py +++ b/pype/plugins/maya/load/_load_animation.py @@ -4,9 +4,9 @@ import pype.maya.plugin class AbcLoader(pype.maya.plugin.ReferenceLoader): """Specific loader of Alembic for the avalon.animation family""" - families = ["studio.animation", - "studio.camera", - "studio.pointcache"] + families = ["animation", + "camera", + "pointcache"] representations = ["abc"] label = "Reference animation" diff --git a/pype/plugins/maya/load/actions.py b/pype/plugins/maya/load/actions.py index 2bdca8506a..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 = ["studio.animation", - "studio.camera", - "studio.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 = ["studio.animation", - "studio.camera", - "studio.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 6f361acedc..c572c60355 100644 --- a/pype/plugins/maya/load/load_alembic.py +++ b/pype/plugins/maya/load/load_alembic.py @@ -4,8 +4,8 @@ import pype.maya.plugin class AbcLoader(pype.maya.plugin.ReferenceLoader): """Specific loader of Alembic for the avalon.animation family""" - families = ["studio.animation", - "studio.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 5994843625..b91ca9ef69 100644 --- a/pype/plugins/maya/load/load_camera.py +++ b/pype/plugins/maya/load/load_camera.py @@ -4,7 +4,7 @@ import pype.maya.plugin class CameraLoader(pype.maya.plugin.ReferenceLoader): """Specific loader of Alembic for the avalon.animation family""" - families = ["studio.camera"] + families = ["camera"] label = "Reference camera" representations = ["abc", "ma"] order = -10 diff --git a/pype/plugins/maya/load/load_look.py b/pype/plugins/maya/load/load_look.py index bcef5eabc6..eede195a49 100644 --- a/pype/plugins/maya/load/load_look.py +++ b/pype/plugins/maya/load/load_look.py @@ -4,7 +4,7 @@ import pype.maya.plugin class LookLoader(pype.maya.plugin.ReferenceLoader): """Specific loader for lookdev""" - families = ["studio.look"] + families = ["look"] representations = ["ma"] label = "Reference look" diff --git a/pype/plugins/maya/load/load_model.py b/pype/plugins/maya/load/load_model.py index c548e9f8e7..145a1a3e00 100644 --- a/pype/plugins/maya/load/load_model.py +++ b/pype/plugins/maya/load/load_model.py @@ -5,7 +5,7 @@ import pype.maya.plugin class ModelLoader(pype.maya.plugin.ReferenceLoader): """Load the model""" - families = ["studio.model"] + families = ["model"] representations = ["ma"] label = "Reference Model" @@ -37,7 +37,7 @@ class ModelLoader(pype.maya.plugin.ReferenceLoader): class GpuCacheLoader(api.Loader): """Load model Alembic as gpuCache""" - families = ["studio.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 e37e6b33dd..aa40ca3cc2 100644 --- a/pype/plugins/maya/load/load_rig.py +++ b/pype/plugins/maya/load/load_rig.py @@ -11,7 +11,7 @@ class RigLoader(pype.maya.plugin.ReferenceLoader): """ - families = ["studio.rig"] + families = ["rig"] representations = ["ma"] label = "Reference rig" @@ -62,7 +62,7 @@ class RigLoader(pype.maya.plugin.ReferenceLoader): cmds.select([output, controls] + roots, noExpand=True) api.create(name=namespace, asset=asset, - family="studio.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 3820345ad0..e0ab27212c 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 = ["studio.setdress"] + families = ["setdress"] representations = ["json"] label = "Load Set Dress" diff --git a/pype/plugins/maya/load/load_vrayproxy.py b/pype/plugins/maya/load/load_vrayproxy.py index 16df4e8cfb..1ee9151ae2 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 = ["studio.vrayproxy"] + families = ["vrayproxy"] representations = ["vrmesh"] label = "Import VRay Proxy" diff --git a/pype/plugins/maya/load/load_yeti_cache.py b/pype/plugins/maya/load/load_yeti_cache.py index 5069e1527c..3942a64b49 100644 --- a/pype/plugins/maya/load/load_yeti_cache.py +++ b/pype/plugins/maya/load/load_yeti_cache.py @@ -13,7 +13,7 @@ from pype.maya import lib class YetiCacheLoader(api.Loader): - families = ["studio.yeticache", "studio.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 f942d15a8b..096b936b41 100644 --- a/pype/plugins/maya/load/load_yeti_rig.py +++ b/pype/plugins/maya/load/load_yeti_rig.py @@ -3,7 +3,7 @@ import pype.maya.plugin class YetiRigLoader(pype.maya.plugin.ReferenceLoader): - families = ["studio.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 4974175b13..156def82bc 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 = ["studio.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 57af4eaf80..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 = ["studio.rig"] + families = ["rig"] verbose = False def process(self, instance): diff --git a/pype/plugins/maya/publish/collect_look.py b/pype/plugins/maya/publish/collect_look.py index 96c1af7584..f7a9c68f96 100644 --- a/pype/plugins/maya/publish/collect_look.py +++ b/pype/plugins/maya/publish/collect_look.py @@ -67,7 +67,7 @@ class CollectLook(pyblish.api.InstancePlugin): """ order = pyblish.api.CollectorOrder + 0.4 - families = ["studio.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 c43595b97c..47808934b3 100644 --- a/pype/plugins/maya/publish/collect_model.py +++ b/pype/plugins/maya/publish/collect_model.py @@ -17,7 +17,7 @@ class CollectModelData(pyblish.api.InstancePlugin): order = pyblish.api.CollectorOrder + 0.499 label = 'Collect Model Data' - families = ["studio.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 e15f184e62..3e5cb64fa6 100644 --- a/pype/plugins/maya/publish/collect_render_layer_aovs.py +++ b/pype/plugins/maya/publish/collect_render_layer_aovs.py @@ -28,7 +28,7 @@ class CollectRenderLayerAOVS(pyblish.api.InstancePlugin): order = pyblish.api.CollectorOrder + 0.01 label = "Render Elements / AOVs" hosts = ["maya"] - families = ["studio.renderlayer"] + families = ["renderlayer"] def process(self, instance): diff --git a/pype/plugins/maya/publish/collect_renderlayers.py b/pype/plugins/maya/publish/collect_renderlayers.py index 0ce0548415..984c44098b 100644 --- a/pype/plugins/maya/publish/collect_renderlayers.py +++ b/pype/plugins/maya/publish/collect_renderlayers.py @@ -74,7 +74,7 @@ class CollectMayaRenderlayers(pyblish.api.ContextPlugin): # instance subset "family": "Render Layers", - "families": ["studio.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 9f6421b2b4..bb56163293 100644 --- a/pype/plugins/maya/publish/collect_setdress.py +++ b/pype/plugins/maya/publish/collect_setdress.py @@ -25,7 +25,7 @@ class CollectSetDress(pyblish.api.InstancePlugin): order = pyblish.api.CollectorOrder + 0.49 label = "Set Dress" - families = ["studio.setdress"] + families = ["setdress"] def process(self, instance): diff --git a/pype/plugins/maya/publish/collect_yeti_cache.py b/pype/plugins/maya/publish/collect_yeti_cache.py index 5d3f1b4bc5..2365162c05 100644 --- a/pype/plugins/maya/publish/collect_yeti_cache.py +++ b/pype/plugins/maya/publish/collect_yeti_cache.py @@ -28,7 +28,7 @@ class CollectYetiCache(pyblish.api.InstancePlugin): order = pyblish.api.CollectorOrder + 0.45 label = "Collect Yeti Cache" - families = ["studio.yetiRig", "studio.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 2f1bb32d6b..7e919fc746 100644 --- a/pype/plugins/maya/publish/collect_yeti_rig.py +++ b/pype/plugins/maya/publish/collect_yeti_rig.py @@ -21,7 +21,7 @@ class CollectYetiRig(pyblish.api.InstancePlugin): order = pyblish.api.CollectorOrder + 0.4 label = "Collect Yeti Rig" - families = ["studio.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 2a24f7dde7..576991b0a9 100644 --- a/pype/plugins/maya/publish/extract_animation.py +++ b/pype/plugins/maya/publish/extract_animation.py @@ -17,7 +17,7 @@ class ExtractColorbleedAnimation(pype.api.Extractor): label = "Extract Animation" hosts = ["maya"] - families = ["studio.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 a4787d2db2..57038a2d6b 100644 --- a/pype/plugins/maya/publish/extract_camera_alembic.py +++ b/pype/plugins/maya/publish/extract_camera_alembic.py @@ -18,7 +18,7 @@ class ExtractCameraAlembic(pype.api.Extractor): label = "Camera (Alembic)" hosts = ["maya"] - families = ["studio.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 f1a41e92ff..f598b11046 100644 --- a/pype/plugins/maya/publish/extract_camera_mayaAscii.py +++ b/pype/plugins/maya/publish/extract_camera_mayaAscii.py @@ -53,7 +53,7 @@ class ExtractCameraMayaAscii(pype.api.Extractor): label = "Camera (Maya Ascii)" hosts = ["maya"] - families = ["studio.camera"] + families = ["camera"] def process(self, instance): diff --git a/pype/plugins/maya/publish/extract_look.py b/pype/plugins/maya/publish/extract_look.py index d78258b532..cd8fdae830 100644 --- a/pype/plugins/maya/publish/extract_look.py +++ b/pype/plugins/maya/publish/extract_look.py @@ -23,7 +23,7 @@ class ExtractLook(pype.api.Extractor): label = "Extract Look (Maya ASCII + JSON)" hosts = ["maya"] - families = ["studio.look"] + families = ["look"] order = pyblish.api.ExtractorOrder + 0.2 def process(self, instance): diff --git a/pype/plugins/maya/publish/extract_model.py b/pype/plugins/maya/publish/extract_model.py index 29a6991c4c..70e92f036e 100644 --- a/pype/plugins/maya/publish/extract_model.py +++ b/pype/plugins/maya/publish/extract_model.py @@ -25,7 +25,7 @@ class ExtractModel(pype.api.Extractor): label = "Model (Maya ASCII)" hosts = ["maya"] - families = ["studio.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 008cd63501..c8a1b0bff0 100644 --- a/pype/plugins/maya/publish/extract_pointcache.py +++ b/pype/plugins/maya/publish/extract_pointcache.py @@ -17,8 +17,8 @@ class ExtractColorbleedAlembic(pype.api.Extractor): label = "Extract Pointcache (Alembic)" hosts = ["maya"] - families = ["studio.pointcache", - "studio.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 9d130c355f..6a92111bc7 100644 --- a/pype/plugins/maya/publish/extract_rig.py +++ b/pype/plugins/maya/publish/extract_rig.py @@ -11,7 +11,7 @@ class ExtractColorbleedRig(pype.api.Extractor): label = "Extract Rig (Maya ASCII)" hosts = ["maya"] - families = ["studio.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 27d8cf518f..c4d613dc61 100644 --- a/pype/plugins/maya/publish/extract_setdress.py +++ b/pype/plugins/maya/publish/extract_setdress.py @@ -18,7 +18,7 @@ class ExtractSetDress(pype.api.Extractor): label = "Extract Set Dress" hosts = ["maya"] - families = ["studio.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 388fd3f97c..2106b404a3 100644 --- a/pype/plugins/maya/publish/extract_vrayproxy.py +++ b/pype/plugins/maya/publish/extract_vrayproxy.py @@ -16,7 +16,7 @@ class ExtractVRayProxy(pype.api.Extractor): label = "VRay Proxy (.vrmesh)" hosts = ["maya"] - families = ["studio.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 08b2ec52a7..086ee44352 100644 --- a/pype/plugins/maya/publish/extract_yeti_cache.py +++ b/pype/plugins/maya/publish/extract_yeti_cache.py @@ -16,7 +16,7 @@ class ExtractYetiCache(pype.api.Extractor): label = "Extract Yeti Cache" hosts = ["maya"] - families = ["studio.yetiRig", "studio.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 b48a55fe2d..9f21c8b44a 100644 --- a/pype/plugins/maya/publish/extract_yeti_rig.py +++ b/pype/plugins/maya/publish/extract_yeti_rig.py @@ -66,7 +66,7 @@ class ExtractYetiRig(pype.api.Extractor): label = "Extract Yeti Rig" hosts = ["maya"] - families = ["studio.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 4f02f707fe..21d4b2fc7a 100644 --- a/pype/plugins/maya/publish/increment_current_file_deadline.py +++ b/pype/plugins/maya/publish/increment_current_file_deadline.py @@ -11,7 +11,7 @@ class IncrementCurrentFileDeadline(pyblish.api.ContextPlugin): label = "Increment current file" order = pyblish.api.IntegratorOrder + 9.0 hosts = ["maya"] - families = ["studio.renderlayer"] + families = ["renderlayer"] optional = True def process(self, context): diff --git a/pype/plugins/maya/publish/save_scene.py b/pype/plugins/maya/publish/save_scene.py index ac84c6ac66..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 = ["studio.renderlayer"] + families = ["renderlayer"] def process(self, context): import maya.cmds as cmds diff --git a/pype/plugins/maya/publish/submit_deadline.py b/pype/plugins/maya/publish/submit_deadline.py index e071223a9e..fa832b4154 100644 --- a/pype/plugins/maya/publish/submit_deadline.py +++ b/pype/plugins/maya/publish/submit_deadline.py @@ -99,7 +99,7 @@ class MayaSubmitDeadline(pyblish.api.InstancePlugin): label = "Submit to Deadline" order = pyblish.api.IntegratorOrder hosts = ["maya"] - families = ["studio.renderlayer"] + families = ["renderlayer"] 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 a05e520d1c..194b6d2d10 100644 --- a/pype/plugins/maya/publish/validate_animation_content.py +++ b/pype/plugins/maya/publish/validate_animation_content.py @@ -12,7 +12,7 @@ class ValidateAnimationContent(pyblish.api.InstancePlugin): order = pype.api.ValidateContentsOrder hosts = ["maya"] - families = ["studio.animation"] + families = ["animation"] label = "Animation Content" actions = [pype.api.SelectInvalidAction] 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 d805437dbe..8d14c87862 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 @@ -16,7 +16,7 @@ class ValidateOutRelatedNodeIds(pyblish.api.InstancePlugin): """ order = pype.api.ValidateContentsOrder - families = ['studio.animation', "studio.pointcache"] + families = ['studio.animation', "pointcache"] hosts = ['maya'] label = 'Animation Out Set Related Node Ids' actions = [pype.api.SelectInvalidAction, pype.api.RepairAction] diff --git a/pype/plugins/maya/publish/validate_deadline_connection.py b/pype/plugins/maya/publish/validate_deadline_connection.py index 7d5ae8dd6d..b416712d9e 100644 --- a/pype/plugins/maya/publish/validate_deadline_connection.py +++ b/pype/plugins/maya/publish/validate_deadline_connection.py @@ -10,7 +10,7 @@ class ValidateDeadlineConnection(pyblish.api.ContextPlugin): label = "Validate Deadline Web Service" order = pyblish.api.ValidatorOrder hosts = ["maya"] - families = ["studio.renderlayer"] + families = ["renderlayer"] def process(self, instance): diff --git a/pype/plugins/maya/publish/validate_frame_range.py b/pype/plugins/maya/publish/validate_frame_range.py index 5dff1f5d7e..64ec9df381 100644 --- a/pype/plugins/maya/publish/validate_frame_range.py +++ b/pype/plugins/maya/publish/validate_frame_range.py @@ -17,10 +17,10 @@ class ValidateFrameRange(pyblish.api.InstancePlugin): label = "Validate Frame Range" order = pype.api.ValidateContentsOrder - families = ["studio.animation", - "studio.pointcache", - "studio.camera", - "studio.renderlayer"] + families = ["animation", + "pointcache", + "camera", + "renderlayer"] def process(self, instance): diff --git a/pype/plugins/maya/publish/validate_model_content.py b/pype/plugins/maya/publish/validate_model_content.py index 6bc4ba0226..716957ca6f 100644 --- a/pype/plugins/maya/publish/validate_model_content.py +++ b/pype/plugins/maya/publish/validate_model_content.py @@ -15,7 +15,7 @@ class ValidateModelContent(pyblish.api.InstancePlugin): order = pype.api.ValidateContentsOrder hosts = ["maya"] - families = ["studio.model"] + families = ["model"] label = "Model Content" actions = [pype.api.SelectInvalidAction] diff --git a/pype/plugins/maya/publish/validate_no_animation.py b/pype/plugins/maya/publish/validate_no_animation.py index 7d83e6d1bc..861a7ee20f 100644 --- a/pype/plugins/maya/publish/validate_no_animation.py +++ b/pype/plugins/maya/publish/validate_no_animation.py @@ -16,7 +16,7 @@ class ValidateNoAnimation(pyblish.api.Validator): order = pype.api.ValidateContentsOrder label = "No Animation" hosts = ["maya"] - families = ["studio.model"] + families = ["model"] optional = True actions = [pype.api.SelectInvalidAction] diff --git a/pype/plugins/maya/publish/validate_no_vraymesh.py b/pype/plugins/maya/publish/validate_no_vraymesh.py index a172191015..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 = ["studio.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 57a8fdee1d..cd941f04aa 100644 --- a/pype/plugins/maya/publish/validate_node_ids.py +++ b/pype/plugins/maya/publish/validate_node_ids.py @@ -16,12 +16,12 @@ class ValidateNodeIDs(pyblish.api.InstancePlugin): order = pype.api.ValidatePipelineOrder label = 'Instance Nodes Have ID' hosts = ['maya'] - families = ["studio.model", - "studio.look", - "studio.rig", - "studio.pointcache", - "studio.animation", - "studio.setdress"] + families = ["model", + "look", + "rig", + "pointcache", + "animation", + "setdress"] actions = [pype.api.SelectInvalidAction, pype.api.GenerateUUIDsOnInvalidAction] diff --git a/pype/plugins/maya/publish/validate_node_ids_related.py b/pype/plugins/maya/publish/validate_node_ids_related.py index e6f0e1a7f2..3b6b6e3528 100644 --- a/pype/plugins/maya/publish/validate_node_ids_related.py +++ b/pype/plugins/maya/publish/validate_node_ids_related.py @@ -14,9 +14,9 @@ class ValidateNodeIDsRelated(pyblish.api.InstancePlugin): order = pype.api.ValidatePipelineOrder label = 'Node Ids Related (ID)' hosts = ['maya'] - families = ["studio.model", - "studio.look", - "studio.rig"] + families = ["model", + "look", + "rig"] optional = True actions = [pype.api.SelectInvalidAction, diff --git a/pype/plugins/maya/publish/validate_node_ids_unique.py b/pype/plugins/maya/publish/validate_node_ids_unique.py index e4f8bebe91..5e1ee9f91c 100644 --- a/pype/plugins/maya/publish/validate_node_ids_unique.py +++ b/pype/plugins/maya/publish/validate_node_ids_unique.py @@ -14,9 +14,9 @@ class ValidateNodeIdsUnique(pyblish.api.InstancePlugin): order = pype.api.ValidatePipelineOrder label = 'Non Duplicate Instance Members (ID)' hosts = ['maya'] - families = ["studio.model", - "studio.look", - "studio.rig"] + families = ["model", + "look", + "rig"] actions = [pype.api.SelectInvalidAction, pype.api.GenerateUUIDsOnInvalidAction] diff --git a/pype/plugins/maya/publish/validate_render_image_rule.py b/pype/plugins/maya/publish/validate_render_image_rule.py index 8b04c67520..762cf963f1 100644 --- a/pype/plugins/maya/publish/validate_render_image_rule.py +++ b/pype/plugins/maya/publish/validate_render_image_rule.py @@ -17,7 +17,7 @@ class ValidateRenderImageRule(pyblish.api.ContextPlugin): order = pype.api.ValidateContentsOrder label = "Images File Rule (Workspace)" hosts = ["maya"] - families = ["studio.renderlayer"] + families = ["renderlayer"] def process(self, context): diff --git a/pype/plugins/maya/publish/validate_renderlayer_aovs.py b/pype/plugins/maya/publish/validate_renderlayer_aovs.py index 1213d44648..d48bb86aed 100644 --- a/pype/plugins/maya/publish/validate_renderlayer_aovs.py +++ b/pype/plugins/maya/publish/validate_renderlayer_aovs.py @@ -23,7 +23,7 @@ class ValidateRenderLayerAOVs(pyblish.api.InstancePlugin): order = pyblish.api.ValidatorOrder + 0.1 label = "Render Passes / AOVs Are Registered" hosts = ["maya"] - families = ["studio.renderlayer"] + families = ["renderlayer"] actions = [pype.api.SelectInvalidAction] def process(self, instance): diff --git a/pype/plugins/maya/publish/validate_rendersettings.py b/pype/plugins/maya/publish/validate_rendersettings.py index 2fe91aa699..4007404670 100644 --- a/pype/plugins/maya/publish/validate_rendersettings.py +++ b/pype/plugins/maya/publish/validate_rendersettings.py @@ -30,7 +30,7 @@ class ValidateRenderSettings(pyblish.api.InstancePlugin): order = pype.api.ValidateContentsOrder label = "Render Settings" hosts = ["maya"] - families = ["studio.renderlayer"] + families = ["renderlayer"] actions = [pype.api.RepairAction] DEFAULT_PADDING = 4 diff --git a/pype/plugins/maya/publish/validate_rig_contents.py b/pype/plugins/maya/publish/validate_rig_contents.py index f58c554c9b..0a9616ba1f 100644 --- a/pype/plugins/maya/publish/validate_rig_contents.py +++ b/pype/plugins/maya/publish/validate_rig_contents.py @@ -16,7 +16,7 @@ class ValidateRigContents(pyblish.api.InstancePlugin): order = pype.api.ValidateContentsOrder label = "Rig Contents" hosts = ["maya"] - families = ["studio.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 da6f8585d7..b99aeae0c9 100644 --- a/pype/plugins/maya/publish/validate_rig_controllers.py +++ b/pype/plugins/maya/publish/validate_rig_controllers.py @@ -26,7 +26,7 @@ class ValidateRigControllers(pyblish.api.InstancePlugin): order = pype.api.ValidateContentsOrder + 0.05 label = "Rig Controllers" hosts = ["maya"] - families = ["studio.rig"] + families = ["rig"] actions = [pype.api.RepairAction, pype.api.SelectInvalidAction] 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 827f496805..6ed17e529a 100644 --- a/pype/plugins/maya/publish/validate_rig_controllers_arnold_attributes.py +++ b/pype/plugins/maya/publish/validate_rig_controllers_arnold_attributes.py @@ -27,7 +27,7 @@ class ValidateRigControllersArnoldAttributes(pyblish.api.InstancePlugin): order = pype.api.ValidateContentsOrder + 0.05 label = "Rig Controllers (Arnold Attributes)" hosts = ["maya"] - families = ["studio.rig"] + families = ["rig"] actions = [pype.api.RepairAction, pype.api.SelectInvalidAction] 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 6d64bb4b31..72abbb9ed2 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 @@ -16,7 +16,7 @@ class ValidateRigOutSetNodeIds(pyblish.api.InstancePlugin): """ order = pype.api.ValidateContentsOrder - families = ["studio.rig"] + families = ["rig"] hosts = ['maya'] label = 'Rig Out Set Node Ids' actions = [pype.api.SelectInvalidAction, pype.api.RepairAction] diff --git a/pype/plugins/maya/publish/validate_setdress_namespaces.py b/pype/plugins/maya/publish/validate_setdress_namespaces.py index 671a08878e..a1056589f6 100644 --- a/pype/plugins/maya/publish/validate_setdress_namespaces.py +++ b/pype/plugins/maya/publish/validate_setdress_namespaces.py @@ -16,7 +16,7 @@ class ValidateSetdressNamespaces(pyblish.api.InstancePlugin): label = "Validate Setdress Namespaces" order = pyblish.api.ValidatorOrder - families = ["studio.setdress"] + families = ["setdress"] actions = [pype.api.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 d9470c3ade..f02ecc3a0b 100644 --- a/pype/plugins/maya/publish/validate_setdress_transforms.py +++ b/pype/plugins/maya/publish/validate_setdress_transforms.py @@ -25,7 +25,7 @@ class ValidateSetDressModelTransforms(pyblish.api.InstancePlugin): order = pyblish.api.ValidatorOrder + 0.49 label = "Setdress Model Transforms" - families = ["studio.setdress"] + families = ["setdress"] actions = [pype.api.SelectInvalidAction, pype.api.RepairAction] diff --git a/pype/plugins/maya/publish/validate_transform_zero.py b/pype/plugins/maya/publish/validate_transform_zero.py index c609e3fe38..5a2e50c93f 100644 --- a/pype/plugins/maya/publish/validate_transform_zero.py +++ b/pype/plugins/maya/publish/validate_transform_zero.py @@ -15,7 +15,7 @@ class ValidateTransformZero(pyblish.api.Validator): order = pype.api.ValidateContentsOrder hosts = ["maya"] - families = ["studio.model"] + families = ["model"] category = "geometry" version = (0, 1, 0) label = "Transform Zero (Freeze)" 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 002689fd18..bfc602ee47 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 @@ -9,7 +9,7 @@ class ValidateYetiRigInputShapesInInstance(pyblish.api.Validator): order = pype.api.ValidateContentsOrder hosts = ["maya"] - families = ["studio.yetiRig"] + families = ["yetiRig"] label = "Yeti Rig Input Shapes In Instance" actions = [pype.api.SelectInvalidAction] diff --git a/pype/plugins/maya/publish/validate_yetirig_cache_state.py b/pype/plugins/maya/publish/validate_yetirig_cache_state.py index e773400cab..707ddae2cd 100644 --- a/pype/plugins/maya/publish/validate_yetirig_cache_state.py +++ b/pype/plugins/maya/publish/validate_yetirig_cache_state.py @@ -17,7 +17,7 @@ class ValidateYetiRigCacheState(pyblish.api.InstancePlugin): order = pyblish.api.ValidatorOrder label = "Yeti Rig Cache State" hosts = ["maya"] - families = ["studio.yetiRig"] + families = ["yetiRig"] actions = [pype.action.RepairAction, pype.action.SelectInvalidAction] diff --git a/pype/plugins/nuke/create/CrateWriteExr.py b/pype/plugins/nuke/create/CrateWriteExr.py index b9b7224101..517513b3ee 100644 --- a/pype/plugins/nuke/create/CrateWriteExr.py +++ b/pype/plugins/nuke/create/CrateWriteExr.py @@ -8,7 +8,7 @@ class CrateWriteExr(avalon.api.Creator): name = "Write_exr" label = "Create Write: exr" hosts = ["nuke"] - family = "studio.write" + family = "write" icon = "sign-out" # def __init__(self, *args, **kwargs): diff --git a/pype/plugins/nuke/load/actions.py b/pype/plugins/nuke/load/actions.py index 245940e377..9c13b68824 100644 --- a/pype/plugins/nuke/load/actions.py +++ b/pype/plugins/nuke/load/actions.py @@ -8,11 +8,11 @@ # class FusionSetFrameRangeLoader(api.Loader): # """Specific loader of Alembic for the avalon.animation family""" # -# families = ["studio.animation", -# "studio.camera", -# "studio.imagesequence", -# "studio.yeticache", -# "studio.pointcache"] +# families = ["animation", +# "camera", +# "imagesequence", +# "yeticache", +# "pointcache"] # representations = ["*"] # # label = "Set frame range" @@ -41,11 +41,11 @@ # class FusionSetFrameRangeWithHandlesLoader(api.Loader): # """Specific loader of Alembic for the avalon.animation family""" # -# families = ["studio.animation", -# "studio.camera", -# "studio.imagesequence", -# "studio.yeticache", -# "studio.pointcache"] +# families = ["animation", +# "camera", +# "imagesequence", +# "yeticache", +# "pointcache"] # representations = ["*"] # # label = "Set frame range (with handles)" diff --git a/pype/plugins/nuke/load/load_sequence.py b/pype/plugins/nuke/load/load_sequence.py index 756c64a30e..c13cab3690 100644 --- a/pype/plugins/nuke/load/load_sequence.py +++ b/pype/plugins/nuke/load/load_sequence.py @@ -113,7 +113,7 @@ # class FusionLoadSequence(api.Loader): # """Load image sequence into Fusion""" # -# families = ["studio.imagesequence"] +# families = ["imagesequence"] # representations = ["*"] # # label = "Load sequence" diff --git a/pype/setdress_api.py b/pype/setdress_api.py index f6dcf95065..c6de0a4f74 100644 --- a/pype/setdress_api.py +++ b/pype/setdress_api.py @@ -137,7 +137,7 @@ def load_package(filepath, name, namespace=None): # manager # for container in containers: # cmds.setAttr("%s.id" % container, - # "studio.setdress.container", + # "setdress.container", # type="string") # TODO: Lock all loaded nodes