diff --git a/.gitignore b/.gitignore index 5dbefa2309..bc20e13873 100644 --- a/.gitignore +++ b/.gitignore @@ -32,6 +32,7 @@ Network Trash Folder Temporary Items .apdisk + # CX_Freeze ########### /build @@ -79,4 +80,5 @@ openpype/premiere/ppro/js/debug.log # VScode files .vscode/ .env -dump.sql \ No newline at end of file +dump.sql +test_localsystem.txt \ No newline at end of file diff --git a/igniter/install_dialog.py b/igniter/install_dialog.py index 0eb518c2e3..5fa676fd5b 100644 --- a/igniter/install_dialog.py +++ b/igniter/install_dialog.py @@ -52,7 +52,7 @@ class InstallDialog(QtWidgets.QDialog): self.setWindowTitle(f"Pype Igniter {__version__} - Pype installation") self._icon_path = os.path.join( - os.path.dirname(__file__), 'pype_icon.png') + os.path.dirname(__file__), 'openpype_icon.png') icon = QtGui.QIcon(self._icon_path) self.setWindowIcon(icon) self.setWindowFlags( diff --git a/igniter/openpype.ico b/igniter/openpype.ico new file mode 100644 index 0000000000..f0c15accc4 Binary files /dev/null and b/igniter/openpype.ico differ diff --git a/igniter/openpype_icon.png b/igniter/openpype_icon.png new file mode 100644 index 0000000000..c3ab1d3002 Binary files /dev/null and b/igniter/openpype_icon.png differ diff --git a/igniter/pype.ico b/igniter/pype.ico deleted file mode 100644 index 746fc36ba2..0000000000 Binary files a/igniter/pype.ico and /dev/null differ diff --git a/igniter/pype_icon.png b/igniter/pype_icon.png deleted file mode 100644 index c17d6ee4c1..0000000000 Binary files a/igniter/pype_icon.png and /dev/null differ diff --git a/pype/hosts/blender/plugins/load/load_action.py b/pype/hosts/blender/plugins/load/load_action.py index 79e42995b3..61dc9ce317 100644 --- a/pype/hosts/blender/plugins/load/load_action.py +++ b/pype/hosts/blender/plugins/load/load_action.py @@ -247,7 +247,7 @@ class BlendActionLoader(pype.hosts.blender.api.plugin.AssetLoader): """Remove an existing container from a Blender scene. Arguments: - container (avalon-core:container-1.0): Container to remove, + container (openpype:container-1.0): Container to remove, from `host.ls()`. Returns: diff --git a/pype/hosts/blender/plugins/load/load_animation.py b/pype/hosts/blender/plugins/load/load_animation.py index a1be6e99ed..53d30d0a66 100644 --- a/pype/hosts/blender/plugins/load/load_animation.py +++ b/pype/hosts/blender/plugins/load/load_animation.py @@ -217,7 +217,7 @@ class BlendAnimationLoader(pype.hosts.blender.api.plugin.AssetLoader): """Remove an existing container from a Blender scene. Arguments: - container (avalon-core:container-1.0): Container to remove, + container (openpype:container-1.0): Container to remove, from `host.ls()`. Returns: diff --git a/pype/hosts/blender/plugins/load/load_camera.py b/pype/hosts/blender/plugins/load/load_camera.py index e6aa11af7e..1e8d4086ac 100644 --- a/pype/hosts/blender/plugins/load/load_camera.py +++ b/pype/hosts/blender/plugins/load/load_camera.py @@ -216,7 +216,7 @@ class BlendCameraLoader(pype.hosts.blender.api.plugin.AssetLoader): """Remove an existing container from a Blender scene. Arguments: - container (avalon-core:container-1.0): Container to remove, + container (openpype:container-1.0): Container to remove, from `host.ls()`. Returns: diff --git a/pype/hosts/blender/plugins/load/load_layout.py b/pype/hosts/blender/plugins/load/load_layout.py index 8d4c9fb75c..cdd5f7db85 100644 --- a/pype/hosts/blender/plugins/load/load_layout.py +++ b/pype/hosts/blender/plugins/load/load_layout.py @@ -251,7 +251,7 @@ class BlendLayoutLoader(plugin.AssetLoader): """Remove an existing container from a Blender scene. Arguments: - container (avalon-core:container-1.0): Container to remove, + container (openpype:container-1.0): Container to remove, from `host.ls()`. Returns: @@ -648,7 +648,7 @@ class UnrealLayoutLoader(plugin.AssetLoader): """Remove an existing container from a Blender scene. Arguments: - container (avalon-core:container-1.0): Container to remove, + container (openpype:container-1.0): Container to remove, from `host.ls()`. Returns: diff --git a/pype/hosts/blender/plugins/load/load_model.py b/pype/hosts/blender/plugins/load/load_model.py index f48c0f8f94..4c6c1a8d7f 100644 --- a/pype/hosts/blender/plugins/load/load_model.py +++ b/pype/hosts/blender/plugins/load/load_model.py @@ -211,7 +211,7 @@ class BlendModelLoader(plugin.AssetLoader): """Remove an existing container from a Blender scene. Arguments: - container (avalon-core:container-1.0): Container to remove, + container (openpype:container-1.0): Container to remove, from `host.ls()`. Returns: diff --git a/pype/hosts/blender/plugins/load/load_rig.py b/pype/hosts/blender/plugins/load/load_rig.py index 1cc722045c..12fca8e4aa 100644 --- a/pype/hosts/blender/plugins/load/load_rig.py +++ b/pype/hosts/blender/plugins/load/load_rig.py @@ -267,7 +267,7 @@ class BlendRigLoader(plugin.AssetLoader): """Remove an existing container from a Blender scene. Arguments: - container (avalon-core:container-1.0): Container to remove, + container (openpype:container-1.0): Container to remove, from `host.ls()`. Returns: diff --git a/pype/hosts/hiero/api/lib.py b/pype/hosts/hiero/api/lib.py index 14760a3137..0d37f2d075 100644 --- a/pype/hosts/hiero/api/lib.py +++ b/pype/hosts/hiero/api/lib.py @@ -241,7 +241,7 @@ def set_track_item_pype_tag(track_item, data=None): tag_data = { "editable": "0", "note": "Pype data holder", - "icon": "pype_icon.png", + "icon": "openpype_icon.png", "metadata": {k: v for k, v in data.items()} } # get available pype tag if any diff --git a/pype/hosts/hiero/api/pipeline.py b/pype/hosts/hiero/api/pipeline.py index 26777fa252..6d9f24698e 100644 --- a/pype/hosts/hiero/api/pipeline.py +++ b/pype/hosts/hiero/api/pipeline.py @@ -110,7 +110,7 @@ def containerise(track_item, """ data_imprint = OrderedDict({ - "schema": "avalon-core:container-2.0", + "schema": "openpype:container-2.0", "id": AVALON_CONTAINER_ID, "name": str(name), "namespace": str(namespace), diff --git a/pype/hosts/maya/api/plugin.py b/pype/hosts/maya/api/plugin.py index 81c89017ff..c24cfad2d3 100644 --- a/pype/hosts/maya/api/plugin.py +++ b/pype/hosts/maya/api/plugin.py @@ -256,7 +256,7 @@ class ReferenceLoader(api.Loader): Deprecated; this functionality is replaced by `api.remove()` Arguments: - container (avalon-core:container-1.0): Which container + container (openpype:container-1.0): Which container to remove from scene. """ diff --git a/pype/hosts/nuke/api/menu.py b/pype/hosts/nuke/api/menu.py index d638034809..8e3cbebbaa 100644 --- a/pype/hosts/nuke/api/menu.py +++ b/pype/hosts/nuke/api/menu.py @@ -1,3 +1,4 @@ +import os import nuke from avalon.api import Session @@ -10,7 +11,7 @@ log = Logger().get_logger(__name__) def install(): menubar = nuke.menu("Nuke") - menu = menubar.findItem(Session["AVALON_LABEL"]) + menu = menubar.findItem(os.environ["AVALON_LABEL"]) # replace reset resolution from avalon core to pype's name = "Work Files..." @@ -90,7 +91,7 @@ def install(): def uninstall(): menubar = nuke.menu("Nuke") - menu = menubar.findItem(Session["AVALON_LABEL"]) + menu = menubar.findItem(os.environ["AVALON_LABEL"]) for item in menu.items(): log.info("Removing menu item: {}".format(item.name())) diff --git a/pype/hosts/resolve/README.markdown b/pype/hosts/resolve/README.markdown index f8d2da0794..50664fbd21 100644 --- a/pype/hosts/resolve/README.markdown +++ b/pype/hosts/resolve/README.markdown @@ -1,7 +1,7 @@ #### Basic setup - Install [latest DaVinci Resolve](https://sw.blackmagicdesign.com/DaVinciResolve/v16.2.8/DaVinci_Resolve_Studio_16.2.8_Windows.zip?Key-Pair-Id=APKAJTKA3ZJMJRQITVEA&Signature=EcFuwQFKHZIBu2zDj5LTCQaQDXcKOjhZY7Fs07WGw24xdDqfwuALOyKu+EVzDX2Tik0cWDunYyV0r7hzp+mHmczp9XP4YaQXHdyhD/2BGWDgiMsiTQbNkBgbfy5MsAMFY8FHCl724Rxm8ke1foWeUVyt/Cdkil+ay+9sL72yFhaSV16sncko1jCIlCZeMkHhbzqPwyRuqLGmxmp8ey9KgBhI3wGFFPN201VMaV+RHrpX+KAfaR6p6dwo3FrPbRHK9TvMI1RA/1lJ3fVtrkDW69LImIKAWmIxgcStUxR9/taqLOD66FNiflHd1tufHv3FBa9iYQsjb3VLMPx7OCwLyg==&Expires=1608308139) -- add absolute path to ffmpeg into pype settings +- add absolute path to ffmpeg into openpype settings ![image](https://user-images.githubusercontent.com/40640033/102630786-43294f00-414d-11eb-98de-f0ae51f62077.png) - install Python 3.6 into `%LOCALAPPDATA%/Programs/Python/Python36` (only respected path by Resolve) - install OpenTimelineIO for 3.6 `%LOCALAPPDATA%\Programs\Python\Python36\python.exe -m pip install git+https://github.com/PixarAnimationStudios/OpenTimelineIO.git@5aa24fbe89d615448876948fe4b4900455c9a3e8` and move builded files from `%LOCALAPPDATA%/Programs/Python/Python36/Lib/site-packages/opentimelineio/cxx-libs/bin and lib` to `%LOCALAPPDATA%/Programs/Python/Python36/Lib/site-packages/opentimelineio/`. I was building it on Win10 machine with Visual Studio Community 2019 and @@ -16,11 +16,11 @@ This is how it looks on my testing project timeline ![image](https://user-images.githubusercontent.com/40640033/102637638-96ec6600-4156-11eb-9656-6e8e3ce4baf8.png) Notice I had renamed tracks to `main` (holding metadata markers) and `review` used for generating review data with ffmpeg confersion to jpg sequence. -1. you need to start Pype menu from Resolve/EditTab/Menu/Workspace/Scripts/**PYPE_MENU** +1. you need to start OpenPype menu from Resolve/EditTab/Menu/Workspace/Scripts/**__OpenPype_Menu__** 2. then select any clips in `main` track and change their color to `Chocolate` -3. in Pype Menu select `Create` +3. in OpenPype Menu select `Create` 4. in Creator select `Create Publishable Clip [New]` (temporary name) 5. set `Rename clips` to True, Master Track to `main` and Use review track to `review` as in picture ![image](https://user-images.githubusercontent.com/40640033/102643773-0d419600-4160-11eb-919e-9c2be0aecab8.png) -6. after you hit `ok` all clips are colored to `ping` and marked with pype metadata tag -7. git `Publish` on pype menu and see that all had been collected correctly. That is the last step for now as rest is Work in progress. Next steps will follow. +6. after you hit `ok` all clips are colored to `ping` and marked with openpype metadata tag +7. git `Publish` on openpype menu and see that all had been collected correctly. That is the last step for now as rest is Work in progress. Next steps will follow. diff --git a/pype/hosts/resolve/api/lib.py b/pype/hosts/resolve/api/lib.py index 11bf8a3217..5c204bf709 100644 --- a/pype/hosts/resolve/api/lib.py +++ b/pype/hosts/resolve/api/lib.py @@ -16,24 +16,24 @@ self = sys.modules[__name__] self.project_manager = None self.media_storage = None -# Pype sequencial rename variables +# OpenPype sequencial rename variables self.rename_index = 0 self.rename_add = 0 self.publish_clip_color = "Pink" self.pype_marker_workflow = True -# Pype compound clip workflow variable +# OpenPype compound clip workflow variable self.pype_tag_name = "VFX Notes" -# Pype marker workflow variables -self.pype_marker_name = "PYPEDATA" +# OpenPype marker workflow variables +self.pype_marker_name = "OpenPypeData" self.pype_marker_duration = 1 self.pype_marker_color = "Mint" self.temp_marker_frame = None -# Pype default timeline -self.pype_timeline_name = "PypeTimeline" +# OpenPype default timeline +self.pype_timeline_name = "OpenPypeTimeline" @contextlib.contextmanager @@ -360,13 +360,13 @@ def get_pype_timeline_item_by_name(name: str) -> object: def get_timeline_item_pype_tag(timeline_item): """ - Get pype track item tag created by creator or loader plugin. + Get openpype track item tag created by creator or loader plugin. Attributes: trackItem (resolve.TimelineItem): resolve object Returns: - dict: pype tag data + dict: openpype tag data """ return_tag = None @@ -389,7 +389,7 @@ def get_timeline_item_pype_tag(timeline_item): def set_timeline_item_pype_tag(timeline_item, data=None): """ - Set pype track item tag to input timeline_item. + Set openpype track item tag to input timeline_item. Attributes: trackItem (resolve.TimelineItem): resolve api object @@ -399,7 +399,7 @@ def set_timeline_item_pype_tag(timeline_item, data=None): """ data = data or dict() - # get available pype tag if any + # get available openpype tag if any tag_data = get_timeline_item_pype_tag(timeline_item) if self.pype_marker_workflow: @@ -418,7 +418,7 @@ def set_timeline_item_pype_tag(timeline_item, data=None): self.pype_tag_name, json.dumps(tag_data)) else: tag_data = data - # if pype tag available then update with input data + # if openpype tag available then update with input data # add it to the input track item timeline_item.SetMetadata(self.pype_tag_name, json.dumps(tag_data)) @@ -672,7 +672,7 @@ def _validate_tc(x): def get_pype_clip_metadata(clip): """ - Get pype metadata created by creator plugin + Get openpype metadata created by creator plugin Attributes: clip (resolve.TimelineItem): resolve's object diff --git a/pype/hosts/resolve/api/menu.py b/pype/hosts/resolve/api/menu.py index 73ea937513..68ba3af967 100644 --- a/pype/hosts/resolve/api/menu.py +++ b/pype/hosts/resolve/api/menu.py @@ -44,11 +44,11 @@ class Spacer(QtWidgets.QWidget): self.setLayout(layout) -class PypeMenu(QtWidgets.QWidget): +class OpenPypeMenu(QtWidgets.QWidget): def __init__(self, *args, **kwargs): super(self.__class__, self).__init__(*args, **kwargs) - self.setObjectName("PypeMenu") + self.setObjectName("OpenPypeMenu") self.setWindowFlags( QtCore.Qt.Window @@ -58,7 +58,7 @@ class PypeMenu(QtWidgets.QWidget): | QtCore.Qt.WindowStaysOnTopHint ) - self.setWindowTitle("Pype") + self.setWindowTitle("OpenPype") workfiles_btn = QtWidgets.QPushButton("Workfiles", self) create_btn = QtWidgets.QPushButton("Create", self) publish_btn = QtWidgets.QPushButton("Publish", self) @@ -144,7 +144,7 @@ class PypeMenu(QtWidgets.QWidget): def launch_pype_menu(): app = QtWidgets.QApplication(sys.argv) - pype_menu = PypeMenu() + pype_menu = OpenPypeMenu() stylesheet = load_stylesheet() pype_menu.setStyleSheet(stylesheet) diff --git a/pype/hosts/resolve/api/menu_style.qss b/pype/hosts/resolve/api/menu_style.qss index 5a1d39fe79..fd947e58c1 100644 --- a/pype/hosts/resolve/api/menu_style.qss +++ b/pype/hosts/resolve/api/menu_style.qss @@ -51,7 +51,7 @@ QLineEdit { qproperty-alignment: AlignCenter; } -#PypeMenu { +#OpenPypeMenu { border: 1px solid #fef9ef; } diff --git a/pype/hosts/resolve/api/pipeline.py b/pype/hosts/resolve/api/pipeline.py index 2d08203650..a1165655ee 100644 --- a/pype/hosts/resolve/api/pipeline.py +++ b/pype/hosts/resolve/api/pipeline.py @@ -110,7 +110,7 @@ def containerise(timeline_item, """ data_imprint = OrderedDict({ - "schema": "avalon-core:container-2.0", + "schema": "openpype:container-2.0", "id": AVALON_CONTAINER_ID, "name": str(name), "namespace": str(namespace), @@ -150,7 +150,7 @@ def ls(): def parse_container(timeline_item, validate=True): - """Return container data from timeline_item's pype tag. + """Return container data from timeline_item's openpype tag. Args: timeline_item (hiero.core.TrackItem): A containerised track item. @@ -187,7 +187,7 @@ def parse_container(timeline_item, validate=True): def update_container(timeline_item, data=None): - """Update container data to input timeline_item's pype tag. + """Update container data to input timeline_item's openpype tag. Args: timeline_item (hiero.core.TrackItem): A containerised track item. diff --git a/pype/hosts/resolve/api/plugin.py b/pype/hosts/resolve/api/plugin.py index 0423f15c2a..1273c9f1df 100644 --- a/pype/hosts/resolve/api/plugin.py +++ b/pype/hosts/resolve/api/plugin.py @@ -25,7 +25,7 @@ class CreatorWidget(QtWidgets.QDialog): | QtCore.Qt.WindowCloseButtonHint | QtCore.Qt.WindowStaysOnTopHint ) - self.setWindowTitle(name or "Pype Creator Input") + self.setWindowTitle(name or "OpenPype Creator Input") self.resize(500, 700) # Where inputs and labels are set @@ -527,7 +527,7 @@ class PublishClip: kwargs (optional): additional data needed for rename=True (presets) Returns: - hiero.core.TrackItem: hiero track item object with pype tag + hiero.core.TrackItem: hiero track item object with openpype tag """ vertical_clip_match = dict() tag_data = dict() @@ -623,7 +623,7 @@ class PublishClip: "track_data": self.timeline_item_data["track"] }) - # create pype tag on timeline_item and add data + # create openpype tag on timeline_item and add data lib.imprint(self.timeline_item, self.tag_data) return self.timeline_item diff --git a/pype/hosts/resolve/api/todo-rendering.py b/pype/hosts/resolve/api/todo-rendering.py index 87b04dd98f..5238d76dec 100644 --- a/pype/hosts/resolve/api/todo-rendering.py +++ b/pype/hosts/resolve/api/todo-rendering.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# TODO: convert this script to be usable with PYPE +# TODO: convert this script to be usable with OpenPype """ Example DaVinci Resolve script: Load a still from DRX file, apply the still to all clips in all timelines. diff --git a/pype/hosts/resolve/api/utils.py b/pype/hosts/resolve/api/utils.py index 32ac5b2aa9..25110de327 100644 --- a/pype/hosts/resolve/api/utils.py +++ b/pype/hosts/resolve/api/utils.py @@ -146,4 +146,4 @@ def setup(env=None): # synchronize resolve utility scripts _sync_utility_scripts(env) - log.info("Resolve Pype wrapper has been installed") + log.info("Resolve OpenPype wrapper has been installed") diff --git a/pype/hosts/resolve/hooks/pre_resolve_setup.py b/pype/hosts/resolve/hooks/pre_resolve_setup.py index d19c56fe09..9e003cc538 100644 --- a/pype/hosts/resolve/hooks/pre_resolve_setup.py +++ b/pype/hosts/resolve/hooks/pre_resolve_setup.py @@ -14,7 +14,7 @@ class ResolvePrelaunch(PreLaunchHook): app_groups = ["resolve"] def execute(self): - # TODO: add OTIO installation from `pype/requirements.py` + # TODO: add OTIO installation from `openpype/requirements.py` # making sure pyton 3.6 is installed at provided path py36_dir = os.path.normpath( self.launch_context.env.get("PYTHON36_RESOLVE", "")) diff --git a/pype/hosts/resolve/plugins/create/create_shot_clip.py b/pype/hosts/resolve/plugins/create/create_shot_clip.py index 09b2b73775..5b7dd66a25 100644 --- a/pype/hosts/resolve/plugins/create/create_shot_clip.py +++ b/pype/hosts/resolve/plugins/create/create_shot_clip.py @@ -12,7 +12,7 @@ class CreateShotClip(resolve.Creator): defaults = ["Main"] gui_tracks = resolve.get_video_track_names() - gui_name = "Pype publish attributes creator" + gui_name = "OpenPype publish attributes creator" gui_info = "Define sequential rename and fill hierarchy data." gui_inputs = { "renameHierarchy": { diff --git a/pype/hosts/resolve/plugins/publish/collect_instances.py b/pype/hosts/resolve/plugins/publish/collect_instances.py index b1eafd512e..2465e2e2c4 100644 --- a/pype/hosts/resolve/plugins/publish/collect_instances.py +++ b/pype/hosts/resolve/plugins/publish/collect_instances.py @@ -26,7 +26,7 @@ class CollectInstances(pyblish.api.ContextPlugin): data = dict() timeline_item = timeline_item_data["clip"]["item"] - # get pype tag data + # get openpype tag data tag_data = resolve.get_timeline_item_pype_tag(timeline_item) self.log.debug(f"__ tag_data: {pformat(tag_data)}") diff --git a/pype/hosts/resolve/utility_scripts/PYPE_sync_util_scripts.py b/pype/hosts/resolve/utility_scripts/OpenPype_sync_util_scripts.py similarity index 82% rename from pype/hosts/resolve/utility_scripts/PYPE_sync_util_scripts.py rename to pype/hosts/resolve/utility_scripts/OpenPype_sync_util_scripts.py index 753bddc1da..5b5d487c74 100644 --- a/pype/hosts/resolve/utility_scripts/PYPE_sync_util_scripts.py +++ b/pype/hosts/resolve/utility_scripts/OpenPype_sync_util_scripts.py @@ -6,7 +6,7 @@ import pype def main(env): import pype.hosts.resolve as bmdvr - # Registers pype's Global pyblish plugins + # Registers openpype's Global pyblish plugins pype.install() bmdvr.setup(env) diff --git a/pype/hosts/resolve/utility_scripts/__PYPE__MENU__.py b/pype/hosts/resolve/utility_scripts/__OpenPype__Menu__.py similarity index 82% rename from pype/hosts/resolve/utility_scripts/__PYPE__MENU__.py rename to pype/hosts/resolve/utility_scripts/__OpenPype__Menu__.py index 230a7a80f0..d49e75bf3a 100644 --- a/pype/hosts/resolve/utility_scripts/__PYPE__MENU__.py +++ b/pype/hosts/resolve/utility_scripts/__OpenPype__Menu__.py @@ -10,10 +10,10 @@ log = Logger().get_logger(__name__) def main(env): import pype.hosts.resolve as bmdvr - # Registers pype's Global pyblish plugins + # Registers openpype's Global pyblish plugins pype.install() - # activate resolve from pype + # activate resolve from openpype avalon.install(bmdvr) log.info(f"Avalon registred hosts: {avalon.registered_host()}") diff --git a/pype/hosts/resolve/utility_scripts/tests/test_otio_as_edl.py b/pype/hosts/resolve/utility_scripts/tests/test_otio_as_edl.py index f6f9454625..819bcaa0d2 100644 --- a/pype/hosts/resolve/utility_scripts/tests/test_otio_as_edl.py +++ b/pype/hosts/resolve/utility_scripts/tests/test_otio_as_edl.py @@ -14,9 +14,9 @@ class ThisTestGUI(TestGUI): def __init__(self): super(ThisTestGUI, self).__init__() - # Registers pype's Global pyblish plugins + # Registers openpype's Global pyblish plugins pype.install() - # activate resolve from pype + # activate resolve from openpype avalon.install(bmdvr) def _open_dir_button_pressed(self, event): diff --git a/pype/hosts/resolve/utility_scripts/tests/testing_create_timeline_item_from_path.py b/pype/hosts/resolve/utility_scripts/tests/testing_create_timeline_item_from_path.py index da1f980388..4c47242ab5 100644 --- a/pype/hosts/resolve/utility_scripts/tests/testing_create_timeline_item_from_path.py +++ b/pype/hosts/resolve/utility_scripts/tests/testing_create_timeline_item_from_path.py @@ -13,9 +13,9 @@ class ThisTestGUI(TestGUI): def __init__(self): super(ThisTestGUI, self).__init__() - # Registers pype's Global pyblish plugins + # Registers openpype's Global pyblish plugins pype.install() - # activate resolve from pype + # activate resolve from openpype avalon.install(bmdvr) def _open_dir_button_pressed(self, event): diff --git a/pype/hosts/tvpaint/resources/avalon.loc b/pype/hosts/tvpaint/resources/avalon.loc index cda27162e6..3cfb7e9db4 100644 --- a/pype/hosts/tvpaint/resources/avalon.loc +++ b/pype/hosts/tvpaint/resources/avalon.loc @@ -10,7 +10,7 @@ #------------ COMMON ----------------------------- #------------------------------------------------- -$100 "Pype Tools" +$100 "OpenPype Tools" $10010 "Workfiles" $10020 "Load" diff --git a/pype/hosts/unreal/plugins/load/load_animation.py b/pype/hosts/unreal/plugins/load/load_animation.py index 5e106788ce..18910983ea 100644 --- a/pype/hosts/unreal/plugins/load/load_animation.py +++ b/pype/hosts/unreal/plugins/load/load_animation.py @@ -99,7 +99,7 @@ class AnimationFBXLoader(api.Loader): container=container_name, path=asset_dir) data = { - "schema": "avalon-core:container-2.0", + "schema": "openpype:container-2.0", "id": pipeline.AVALON_CONTAINER_ID, "asset": asset, "namespace": asset_dir, diff --git a/pype/hosts/unreal/plugins/load/load_rig.py b/pype/hosts/unreal/plugins/load/load_rig.py index 56351e388b..7f6e31618a 100644 --- a/pype/hosts/unreal/plugins/load/load_rig.py +++ b/pype/hosts/unreal/plugins/load/load_rig.py @@ -96,7 +96,7 @@ class SkeletalMeshFBXLoader(api.Loader): container=container_name, path=asset_dir) data = { - "schema": "avalon-core:container-2.0", + "schema": "openpype:container-2.0", "id": pipeline.AVALON_CONTAINER_ID, "asset": asset, "namespace": asset_dir, diff --git a/pype/hosts/unreal/plugins/load/load_setdress.py b/pype/hosts/unreal/plugins/load/load_setdress.py index 08330e349b..da302deb1c 100644 --- a/pype/hosts/unreal/plugins/load/load_setdress.py +++ b/pype/hosts/unreal/plugins/load/load_setdress.py @@ -67,7 +67,7 @@ class AnimationCollectionLoader(api.Loader): container=container_name, path=asset_dir) data = { - "schema": "avalon-core:container-2.0", + "schema": "openpype:container-2.0", "id": pipeline.AVALON_CONTAINER_ID, "asset": asset, "namespace": asset_dir, diff --git a/pype/hosts/unreal/plugins/load/load_staticmeshfbx.py b/pype/hosts/unreal/plugins/load/load_staticmeshfbx.py index 149bafcacc..dbea1d5951 100644 --- a/pype/hosts/unreal/plugins/load/load_staticmeshfbx.py +++ b/pype/hosts/unreal/plugins/load/load_staticmeshfbx.py @@ -79,7 +79,7 @@ class StaticMeshFBXLoader(api.Loader): container=container_name, path=asset_dir) data = { - "schema": "avalon-core:container-2.0", + "schema": "openpype:container-2.0", "id": pipeline.AVALON_CONTAINER_ID, "asset": asset, "namespace": asset_dir, diff --git a/pype/modules/ftrack/event_handlers_user/action_store_thumbnails_to_avalon.py b/pype/modules/ftrack/event_handlers_user/action_store_thumbnails_to_avalon.py index 4fbea6b8a5..ac09d0c126 100644 --- a/pype/modules/ftrack/event_handlers_user/action_store_thumbnails_to_avalon.py +++ b/pype/modules/ftrack/event_handlers_user/action_store_thumbnails_to_avalon.py @@ -274,7 +274,7 @@ class StoreThumbnailsToAvalon(BaseAction): thumbnail_entity = { "_id": thumbnail_id, "type": "thumbnail", - "schema": "pype:thumbnail-1.0", + "schema": "openpype:thumbnail-1.0", "data": { "template": thumbnail_template, "template_data": template_data diff --git a/pype/modules/ftrack/lib/avalon_sync.py b/pype/modules/ftrack/lib/avalon_sync.py index 43e02283c2..1dd045ac86 100644 --- a/pype/modules/ftrack/lib/avalon_sync.py +++ b/pype/modules/ftrack/lib/avalon_sync.py @@ -31,13 +31,13 @@ log = Logger.get_logger(__name__) # Current schemas for avalon types EntitySchemas = { - "project": "pype:project-3.0", - "asset": "pype:asset-3.0", - "config": "pype:config-2.0" + "project": "openpype:project-3.0", + "asset": "openpype:asset-3.0", + "config": "openpype:config-2.0" } # Group name of custom attributes -CUST_ATTR_GROUP = "pype" +CUST_ATTR_GROUP = "openpype" # name of Custom attribute that stores mongo_id from avalon db CUST_ATTR_ID_KEY = "avalon_mongo_id" @@ -102,11 +102,12 @@ def get_pype_attr(session, split_hierarchical=True, query_keys=None): "is_hierarchical", "default" ] - # TODO remove deprecated "avalon" group from query + # TODO remove deprecated "pype" group from query cust_attrs_query = ( "select {}" " from CustomAttributeConfiguration" - " where group.name in (\"avalon\", \"{}\")" + # Kept `pype` for Backwards Compatiblity + " where group.name in (\"pype\", \"{}\")" ).format(", ".join(query_keys), CUST_ATTR_GROUP) all_avalon_attr = session.query(cust_attrs_query).all() for cust_attr in all_avalon_attr: diff --git a/pype/modules/ftrack/plugins/publish/integrate_hierarchy_ftrack.py b/pype/modules/ftrack/plugins/publish/integrate_hierarchy_ftrack.py index b4a2760c93..68d0f9cf55 100644 --- a/pype/modules/ftrack/plugins/publish/integrate_hierarchy_ftrack.py +++ b/pype/modules/ftrack/plugins/publish/integrate_hierarchy_ftrack.py @@ -6,9 +6,11 @@ from avalon import io # Copy of constant `pype.modules.ftrack.lib.avalon_sync.CUST_ATTR_AUTO_SYNC` CUST_ATTR_AUTO_SYNC = "avalon_auto_sync" +CUST_ATTR_GROUP = "openpype" # Copy of `get_pype_attr` from pype.modules.ftrack.lib +# TODO import from openpype's ftrack module when possible to not break Python 2 def get_pype_attr(session, split_hierarchical=True): custom_attributes = [] hier_custom_attributes = [] @@ -16,8 +18,9 @@ def get_pype_attr(session, split_hierarchical=True): cust_attrs_query = ( "select id, entity_type, object_type_id, is_hierarchical, default" " from CustomAttributeConfiguration" - " where group.name in (\"avalon\", \"pype\")" - ) + # Kept `pype` for Backwards Compatiblity + " where group.name in (\"pype\", \"{}\")" + ).format(CUST_ATTR_GROUP) all_avalon_attr = session.query(cust_attrs_query).all() for cust_attr in all_avalon_attr: if split_hierarchical and cust_attr["is_hierarchical"]: diff --git a/pype/plugins/publish/extract_hierarchy_avalon.py b/pype/plugins/publish/extract_hierarchy_avalon.py index 74751c6807..dd1f09bafa 100644 --- a/pype/plugins/publish/extract_hierarchy_avalon.py +++ b/pype/plugins/publish/extract_hierarchy_avalon.py @@ -2,6 +2,7 @@ import pyblish.api from avalon import io from copy import deepcopy + class ExtractHierarchyToAvalon(pyblish.api.ContextPlugin): """Create entities in Avalon based on collected data.""" @@ -148,7 +149,7 @@ class ExtractHierarchyToAvalon(pyblish.api.ContextPlugin): # Unarchived asset should not use same data new_entity = { "_id": entity["_id"], - "schema": "avalon-core:asset-3.0", + "schema": "openpype:asset-3.0", "name": entity["name"], "parent": self.project["_id"], "type": "asset", @@ -162,7 +163,7 @@ class ExtractHierarchyToAvalon(pyblish.api.ContextPlugin): def create_avalon_asset(self, name, data): item = { - "schema": "avalon-core:asset-3.0", + "schema": "openpype:asset-3.0", "name": name, "parent": self.project["_id"], "type": "asset", diff --git a/pype/plugins/publish/integrate_master_version.py b/pype/plugins/publish/integrate_master_version.py index 7709f089fe..ec836954e8 100644 --- a/pype/plugins/publish/integrate_master_version.py +++ b/pype/plugins/publish/integrate_master_version.py @@ -168,7 +168,7 @@ class IntegrateHeroVersion(pyblish.api.InstancePlugin): "version_id": src_version_entity["_id"], "parent": src_version_entity["parent"], "type": "hero_version", - "schema": "pype:hero_version-1.0" + "schema": "openpype:hero_version-1.0" } schema.validate(new_hero_version) diff --git a/pype/plugins/publish/integrate_new.py b/pype/plugins/publish/integrate_new.py index d4a094a975..d342ba2e39 100644 --- a/pype/plugins/publish/integrate_new.py +++ b/pype/plugins/publish/integrate_new.py @@ -501,7 +501,7 @@ class IntegrateAssetNew(pyblish.api.InstancePlugin): data.update({'path': dst, 'template': template}) representation = { "_id": repre_id, - "schema": "pype:representation-2.0", + "schema": "openpype:representation-2.0", "type": "representation", "parent": version_id, "name": repre['name'], @@ -685,7 +685,7 @@ class IntegrateAssetNew(pyblish.api.InstancePlugin): families.append(_family) _id = io.insert_one({ - "schema": "pype:subset-3.0", + "schema": "openpype:subset-3.0", "type": "subset", "name": subset_name, "data": { @@ -726,7 +726,7 @@ class IntegrateAssetNew(pyblish.api.InstancePlugin): dict: collection of data to create a version """ - return {"schema": "pype:version-3.0", + return {"schema": "openpype:version-3.0", "type": "version", "parent": subset["_id"], "name": version_number, diff --git a/pype/plugins/publish/integrate_thumbnail.py b/pype/plugins/publish/integrate_thumbnail.py index 23d2da5f4b..28a93efb9a 100644 --- a/pype/plugins/publish/integrate_thumbnail.py +++ b/pype/plugins/publish/integrate_thumbnail.py @@ -130,7 +130,7 @@ class IntegrateThumbnails(pyblish.api.InstancePlugin): thumbnail_entity = { "_id": thumbnail_id, "type": "thumbnail", - "schema": "pype:thumbnail-1.0", + "schema": "openpype:thumbnail-1.0", "data": { "template": thumbnail_template, "template_data": repre_context diff --git a/pype/resources/__init__.py b/pype/resources/__init__.py index 9adce2afe4..fdee38ab34 100644 --- a/pype/resources/__init__.py +++ b/pype/resources/__init__.py @@ -35,9 +35,9 @@ def pype_icon_filepath(debug=None): debug = bool(os.getenv("PYPE_DEV")) if debug: - icon_file_name = "pype_icon_dev.png" + icon_file_name = "openpype_icon_staging.png" else: - icon_file_name = "pype_icon.png" + icon_file_name = "openpype_icon.png" return get_resource("icons", icon_file_name) @@ -46,7 +46,7 @@ def pype_splash_filepath(debug=None): debug = bool(os.getenv("PYPE_DEV")) if debug: - splash_file_name = "pype_splash_dev.png" + splash_file_name = "openpype_splash_staging.png" else: - splash_file_name = "pype_splash.png" + splash_file_name = "openpype_splash.png" return get_resource("icons", splash_file_name) diff --git a/pype/resources/icons/circle_green.png b/pype/resources/icons/circle_green.png index b83369a9e3..6b5e27c49e 100644 Binary files a/pype/resources/icons/circle_green.png and b/pype/resources/icons/circle_green.png differ diff --git a/pype/resources/icons/circle_red.png b/pype/resources/icons/circle_red.png index 99d01b3baa..ba8e9c8fe7 100644 Binary files a/pype/resources/icons/circle_red.png and b/pype/resources/icons/circle_red.png differ diff --git a/pype/resources/icons/inventory.png b/pype/resources/icons/inventory.png index 34f6488233..07e0f9cd18 100644 Binary files a/pype/resources/icons/inventory.png and b/pype/resources/icons/inventory.png differ diff --git a/pype/resources/icons/loader.png b/pype/resources/icons/loader.png index 1988fc76e9..f3acabb233 100644 Binary files a/pype/resources/icons/loader.png and b/pype/resources/icons/loader.png differ diff --git a/pype/resources/icons/lookmanager.png b/pype/resources/icons/lookmanager.png index 9ed1d3db8e..c929037cdf 100644 Binary files a/pype/resources/icons/lookmanager.png and b/pype/resources/icons/lookmanager.png differ diff --git a/pype/resources/icons/openpype_icon.png b/pype/resources/icons/openpype_icon.png new file mode 100644 index 0000000000..c3ab1d3002 Binary files /dev/null and b/pype/resources/icons/openpype_icon.png differ diff --git a/pype/resources/icons/openpype_icon_staging.png b/pype/resources/icons/openpype_icon_staging.png new file mode 100644 index 0000000000..2bcf342c20 Binary files /dev/null and b/pype/resources/icons/openpype_icon_staging.png differ diff --git a/pype/resources/icons/openpype_splash.png b/pype/resources/icons/openpype_splash.png new file mode 100644 index 0000000000..d44ffb29b4 Binary files /dev/null and b/pype/resources/icons/openpype_splash.png differ diff --git a/pype/resources/icons/openpype_splash_staging.png b/pype/resources/icons/openpype_splash_staging.png new file mode 100644 index 0000000000..2ac49abb9d Binary files /dev/null and b/pype/resources/icons/openpype_splash_staging.png differ diff --git a/pype/resources/icons/pype_icon.png b/pype/resources/icons/pype_icon.png deleted file mode 100644 index bfacf6eeed..0000000000 Binary files a/pype/resources/icons/pype_icon.png and /dev/null differ diff --git a/pype/resources/icons/pype_icon_dev.png b/pype/resources/icons/pype_icon_dev.png deleted file mode 100644 index b452eb2812..0000000000 Binary files a/pype/resources/icons/pype_icon_dev.png and /dev/null differ diff --git a/pype/resources/icons/pype_splash.png b/pype/resources/icons/pype_splash.png deleted file mode 100644 index bfacf6eeed..0000000000 Binary files a/pype/resources/icons/pype_splash.png and /dev/null differ diff --git a/pype/resources/icons/pype_splash_dev.png b/pype/resources/icons/pype_splash_dev.png deleted file mode 100644 index b452eb2812..0000000000 Binary files a/pype/resources/icons/pype_splash_dev.png and /dev/null differ diff --git a/pype/resources/icons/workfiles.png b/pype/resources/icons/workfiles.png index f17c869600..8541a6d68c 100644 Binary files a/pype/resources/icons/workfiles.png and b/pype/resources/icons/workfiles.png differ diff --git a/pype/settings/defaults/project_anatomy/attributes.json b/pype/settings/defaults/project_anatomy/attributes.json index 1d16be42c5..987021f25b 100644 --- a/pype/settings/defaults/project_anatomy/attributes.json +++ b/pype/settings/defaults/project_anatomy/attributes.json @@ -9,6 +9,18 @@ "resolutionWidth": 1920, "resolutionHeight": 1080, "pixelAspect": 1.0, - "applications": [], + "applications": [ + "maya_2020", + "nuke_12-2", + "nukex_12-2", + "hiero_12-2", + "resolve_16", + "houdini_18-5", + "blender_2-90", + "harmony_20", + "photoshop_2021", + "aftereffects_2021", + "unreal_4-24" + ], "tools_env": [] } \ No newline at end of file diff --git a/pype/settings/defaults/project_settings/global.json b/pype/settings/defaults/project_settings/global.json index c8eea42134..8081f92ef7 100644 --- a/pype/settings/defaults/project_settings/global.json +++ b/pype/settings/defaults/project_settings/global.json @@ -1,10 +1,4 @@ { - "project_plugins": { - "windows": [], - "darwin": [], - "linux": [] - }, - "project_environments": {}, "publish": { "IntegrateHeroVersion": { "enabled": true @@ -220,5 +214,11 @@ } } } - } + }, + "project_plugins": { + "windows": [], + "darwin": [], + "linux": [] + }, + "project_environments": {} } \ No newline at end of file diff --git a/pype/settings/defaults/project_settings/maya.json b/pype/settings/defaults/project_settings/maya.json index 6945bb0581..feddd2860a 100644 --- a/pype/settings/defaults/project_settings/maya.json +++ b/pype/settings/defaults/project_settings/maya.json @@ -459,39 +459,6 @@ 0.8, 0.5 ] - }, - "ReferenceLoader": { - "enabled": true, - "representations": [ - "ma", - "mb", - "abc", - "fbx" - ] - }, - "AudioLoader": { - "enabled": true, - "representations": [ - "wav" - ] - }, - "GpuCacheLoader": { - "enabled": true, - "representations": [ - "abc" - ] - }, - "ImagePlaneLoader": { - "enabled": true, - "representations": [ - "jpg", - "png", - "mov" - ] - }, - "MatchmoveLoader": { - "enabled": true, - "representations": [] } }, "workfile_build": { diff --git a/pype/settings/entities/schemas/projects_schema/schemas/schema_maya_load.json b/pype/settings/entities/schemas/projects_schema/schemas/schema_maya_load.json index 3615c1477c..dd9d0508b4 100644 --- a/pype/settings/entities/schemas/projects_schema/schemas/schema_maya_load.json +++ b/pype/settings/entities/schemas/projects_schema/schemas/schema_maya_load.json @@ -151,32 +151,6 @@ ] } ] - }, - { - "type": "schema_template", - "name": "template_loader_plugin", - "template_data": [ - { - "key": "ReferenceLoader", - "label": "Reference Loader" - }, - { - "key": "AudioLoader", - "label": "Audio Loader" - }, - { - "key": "GpuCacheLoader", - "label": "GpuCache Loader" - }, - { - "key": "ImagePlaneLoader", - "label": "Imageplane Loader" - }, - { - "key": "MatchmoveLoader", - "label": "Matchmove Loader" - } - ] } ] } diff --git a/pype/settings/entities/schemas/projects_schema/schemas/schema_nuke_load.json b/pype/settings/entities/schemas/projects_schema/schemas/schema_nuke_load.json index 9d132e33b4..737843ad98 100644 --- a/pype/settings/entities/schemas/projects_schema/schemas/schema_nuke_load.json +++ b/pype/settings/entities/schemas/projects_schema/schemas/schema_nuke_load.json @@ -6,7 +6,7 @@ "children": [ { "type": "schema_template", - "name": "template_loader_plugin", + "name": "template_loader_plugin_nuke", "template_data": [ { "key": "LoadImage", diff --git a/pype/settings/entities/schemas/projects_schema/schemas/template_loader_plugin.json b/pype/settings/entities/schemas/projects_schema/schemas/template_loader_plugin_nuke.json similarity index 100% rename from pype/settings/entities/schemas/projects_schema/schemas/template_loader_plugin.json rename to pype/settings/entities/schemas/projects_schema/schemas/template_loader_plugin_nuke.json diff --git a/pype/tests/test_mongo_performance.py b/pype/tests/test_mongo_performance.py index ea5ea90aae..cd606d6483 100644 --- a/pype/tests/test_mongo_performance.py +++ b/pype/tests/test_mongo_performance.py @@ -108,7 +108,7 @@ class TestPerformance(): "template": "{root}\\{project[name]}\\{hierarchy}\\{asset}\\publish\\{family}\\{subset}\\v{version:0>3}\\{project[code]}_{asset}_{subset}_v{version:0>3}<_{output}><.{frame:0>4}>.{representation}" }, "type": "representation", - "schema": "pype:representation-2.0" + "schema": "openpype:representation-2.0" } insert_recs.append(document) diff --git a/pype/tools/assetcreator/app.py b/pype/tools/assetcreator/app.py index f025af9662..366bb8be08 100644 --- a/pype/tools/assetcreator/app.py +++ b/pype/tools/assetcreator/app.py @@ -396,7 +396,7 @@ class Window(QtWidgets.QDialog): new_asset_info = { 'parent': av_project['_id'], 'name': name, - 'schema': "avalon-core:asset-3.0", + 'schema': "openpype:asset-3.0", 'type': 'asset', 'data': new_asset_data } diff --git a/pype/tools/settings/settings/style/__init__.py b/pype/tools/settings/settings/style/__init__.py index a8f202d97b..9bb5e851b4 100644 --- a/pype/tools/settings/settings/style/__init__.py +++ b/pype/tools/settings/settings/style/__init__.py @@ -9,4 +9,4 @@ def load_stylesheet(): def app_icon_path(): - return os.path.join(os.path.dirname(__file__), "pype_icon.png") + return os.path.join(os.path.dirname(__file__), "openpype_icon.png") diff --git a/repos/avalon-core b/repos/avalon-core index 911a29a44d..de43124167 160000 --- a/repos/avalon-core +++ b/repos/avalon-core @@ -1 +1 @@ -Subproject commit 911a29a44d5e6a128f4326deb1155184fe811fd7 +Subproject commit de4312416704102a3587802d7a042e75efb99d49 diff --git a/schema/application-1.0.json b/schema/application-1.0.json index e2418037c6..953abee569 100644 --- a/schema/application-1.0.json +++ b/schema/application-1.0.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schema.org/draft-04/schema#", - "title": "pype:application-1.0", + "title": "openpype:application-1.0", "description": "An application definition.", "type": "object", diff --git a/schema/asset-1.0.json b/schema/asset-1.0.json index 6f3665c628..ab104c002a 100644 --- a/schema/asset-1.0.json +++ b/schema/asset-1.0.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schema.org/draft-04/schema#", - "title": "pype:asset-1.0", + "title": "openpype:asset-1.0", "description": "A unit of data", "type": "object", @@ -32,4 +32,4 @@ }, "definitions": {} -} \ No newline at end of file +} diff --git a/schema/asset-2.0.json b/schema/asset-2.0.json index 066cb33498..b894d79792 100644 --- a/schema/asset-2.0.json +++ b/schema/asset-2.0.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schema.org/draft-04/schema#", - "title": "pype:asset-2.0", + "title": "openpype:asset-2.0", "description": "A unit of data", "type": "object", @@ -20,8 +20,8 @@ "schema": { "description": "Schema identifier for payload", "type": "string", - "enum": ["avalon-core:asset-2.0"], - "example": "avalon-core:asset-2.0" + "enum": ["openpype:asset-2.0"], + "example": "openpype:asset-2.0" }, "type": { "description": "The type of document", diff --git a/schema/asset-3.0.json b/schema/asset-3.0.json index a3a22e917b..948704d2a1 100644 --- a/schema/asset-3.0.json +++ b/schema/asset-3.0.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schema.org/draft-04/schema#", - "title": "pype:asset-3.0", + "title": "openpype:asset-3.0", "description": "A unit of data", "type": "object", @@ -19,8 +19,8 @@ "schema": { "description": "Schema identifier for payload", "type": "string", - "enum": ["avalon-core:asset-3.0", "pype:asset-3.0"], - "example": "avalon-core:asset-3.0" + "enum": ["openpype:asset-3.0"], + "example": "openpype:asset-3.0" }, "type": { "description": "The type of document", diff --git a/schema/config-1.0.json b/schema/config-1.0.json index 198f51e04d..49398a57cd 100644 --- a/schema/config-1.0.json +++ b/schema/config-1.0.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schema.org/draft-04/schema#", - "title": "pype:config-1.0", + "title": "openpype:config-1.0", "description": "A project configuration.", "type": "object", diff --git a/schema/config-1.1.json b/schema/config-1.1.json index ea5ab0ff27..6e15514aaf 100644 --- a/schema/config-1.1.json +++ b/schema/config-1.1.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schema.org/draft-04/schema#", - "title": "pype:config-1.1", + "title": "openpype:config-1.1", "description": "A project configuration.", "type": "object", diff --git a/schema/config-2.0.json b/schema/config-2.0.json index 098d1983e2..54b226711a 100644 --- a/schema/config-2.0.json +++ b/schema/config-2.0.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schema.org/draft-04/schema#", - "title": "pype:config-2.0", + "title": "openpype:config-2.0", "description": "A project configuration.", "type": "object", diff --git a/schema/container-1.0.json b/schema/container-1.0.json index d9e4e39f7f..012e8499e6 100644 --- a/schema/container-1.0.json +++ b/schema/container-1.0.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schema.org/draft-04/schema#", - "title": "pype:container-1.0", + "title": "openpype:container-1.0", "description": "A loaded asset", "type": "object", diff --git a/schema/container-2.0.json b/schema/container-2.0.json index 7b84209ea0..1673ee5d1d 100644 --- a/schema/container-2.0.json +++ b/schema/container-2.0.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schema.org/draft-04/schema#", - "title": "pype:container-2.0", + "title": "openpype:container-2.0", "description": "A loaded asset", "type": "object", @@ -21,8 +21,8 @@ "schema": { "description": "Schema identifier for payload", "type": "string", - "enum": ["avalon-core:container-2.0", "pype:container-2.0"], - "example": "pype:container-2.0" + "enum": ["openpype:container-2.0"], + "example": "openpype:container-2.0" }, "id": { "description": "Identifier for finding object in host", @@ -56,4 +56,4 @@ "example": "59523f355f8c1b5f6c5e8348" } } -} \ No newline at end of file +} diff --git a/schema/hero_version-1.0.json b/schema/hero_version-1.0.json index 83304ef4d5..b720dc2887 100644 --- a/schema/hero_version-1.0.json +++ b/schema/hero_version-1.0.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schema.org/draft-04/schema#", - "title": "pype:hero_version-1.0", + "title": "openpype:hero_version-1.0", "description": "Hero version of asset", "type": "object", @@ -27,8 +27,8 @@ "schema": { "description": "The schema associated with this document", "type": "string", - "enum": ["avalon-core:hero_version-1.0", "pype:hero_version-1.0"], - "example": "pype:hero_version-1.0" + "enum": ["openpype:hero_version-1.0"], + "example": "openpype:hero_version-1.0" }, "type": { "description": "The type of document", diff --git a/schema/inventory-1.0.json b/schema/inventory-1.0.json index 888ba7945a..2fe78794ab 100644 --- a/schema/inventory-1.0.json +++ b/schema/inventory-1.0.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schema.org/draft-04/schema#", - "title": "pype:config-1.0", + "title": "openpype:config-1.0", "description": "A project configuration.", "type": "object", diff --git a/schema/inventory-1.1.json b/schema/inventory-1.1.json index 1b572b7d23..b61a76b32a 100644 --- a/schema/inventory-1.1.json +++ b/schema/inventory-1.1.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schema.org/draft-04/schema#", - "title": "pype:config-1.1", + "title": "openpype:config-1.1", "description": "A project configuration.", "type": "object", diff --git a/schema/project-2.0.json b/schema/project-2.0.json index ad0e460f4d..0ed5a55599 100644 --- a/schema/project-2.0.json +++ b/schema/project-2.0.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schema.org/draft-04/schema#", - "title": "pype:project-2.0", + "title": "openpype:project-2.0", "description": "A unit of data", "type": "object", @@ -20,8 +20,8 @@ "schema": { "description": "Schema identifier for payload", "type": "string", - "enum": ["avalon-core:project-2.0", "pype:project-2.0"], - "example": "avalon-core:project-2.0" + "enum": ["openpype:project-2.0"], + "example": "openpype:project-2.0" }, "type": { "description": "The type of document", @@ -52,7 +52,7 @@ "type": "object", "description": "Document metadata", "example": { - "schema": "pype:config-1.0", + "schema": "openpype:config-1.0", "apps": [ { "name": "maya2016", diff --git a/schema/project-2.1.json b/schema/project-2.1.json index 40e3bdb638..9413c9f691 100644 --- a/schema/project-2.1.json +++ b/schema/project-2.1.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schema.org/draft-04/schema#", - "title": "pype:project-2.1", + "title": "openpype:project-2.1", "description": "A unit of data", "type": "object", @@ -20,8 +20,8 @@ "schema": { "description": "Schema identifier for payload", "type": "string", - "enum": ["avalon-core:project-2.1", "pype:project-2.1"], - "example": "avalon-core:project-2.1" + "enum": ["openpype:project-2.1"], + "example": "openpype:project-2.1" }, "type": { "description": "The type of document", @@ -52,7 +52,7 @@ "type": "object", "description": "Document metadata", "example": { - "schema": "pype:config-1.1", + "schema": "openpype:config-1.1", "apps": [ { "name": "maya2016", diff --git a/schema/project-3.0.json b/schema/project-3.0.json index d6368d665c..be23e10c93 100644 --- a/schema/project-3.0.json +++ b/schema/project-3.0.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schema.org/draft-04/schema#", - "title": "pype:project-3.0", + "title": "openpype:project-3.0", "description": "A unit of data", "type": "object", @@ -20,8 +20,8 @@ "schema": { "description": "Schema identifier for payload", "type": "string", - "enum": ["pype:project-3.0"], - "example": "pype:project-3.0" + "enum": ["openpype:project-3.0"], + "example": "openpype:project-3.0" }, "type": { "description": "The type of document", diff --git a/schema/representation-1.0.json b/schema/representation-1.0.json index 10ae72928e..347c585f52 100644 --- a/schema/representation-1.0.json +++ b/schema/representation-1.0.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schema.org/draft-04/schema#", - "title": "pype:representation-1.0", + "title": "openpype:representation-1.0", "description": "The inverse of an instance", "type": "object", diff --git a/schema/representation-2.0.json b/schema/representation-2.0.json index e12dea8564..f47c16a10a 100644 --- a/schema/representation-2.0.json +++ b/schema/representation-2.0.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schema.org/draft-04/schema#", - "title": "pype:representation-2.0", + "title": "openpype:representation-2.0", "description": "The inverse of an instance", "type": "object", @@ -20,8 +20,8 @@ "schema": { "description": "Schema identifier for payload", "type": "string", - "enum": ["avalon-core:representation-2.0", "pype:representation-2.0"], - "example": "pype:representation-2.0" + "enum": ["openpype:representation-2.0"], + "example": "openpype:representation-2.0" }, "type": { "description": "The type of document", diff --git a/schema/session-1.0.json b/schema/session-1.0.json index 2b201f9c61..5ced0a6f08 100644 --- a/schema/session-1.0.json +++ b/schema/session-1.0.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schema.org/draft-04/schema#", - "title": "pype:session-1.0", + "title": "openpype:session-1.0", "description": "The Avalon environment", "type": "object", @@ -140,4 +140,4 @@ "example": "True" } } -} \ No newline at end of file +} diff --git a/schema/session-2.0.json b/schema/session-2.0.json index 7ad2c63bcf..0a4d51beb2 100644 --- a/schema/session-2.0.json +++ b/schema/session-2.0.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schema.org/draft-04/schema#", - "title": "pype:session-2.0", + "title": "openpype:session-2.0", "description": "The Avalon environment", "type": "object", diff --git a/schema/shaders-1.0.json b/schema/shaders-1.0.json index e66cc735e8..7102ba1861 100644 --- a/schema/shaders-1.0.json +++ b/schema/shaders-1.0.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schema.org/draft-04/schema#", - "title": "pype:shaders-1.0", + "title": "openpype:shaders-1.0", "description": "Relationships between shaders and Avalon IDs", "type": "object", diff --git a/schema/subset-1.0.json b/schema/subset-1.0.json index 90ae0349fa..a299a6d341 100644 --- a/schema/subset-1.0.json +++ b/schema/subset-1.0.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schema.org/draft-04/schema#", - "title": "pype:subset-1.0", + "title": "openpype:subset-1.0", "description": "A container of instances", "type": "object", @@ -32,4 +32,4 @@ }, "definitions": {} -} \ No newline at end of file +} diff --git a/schema/subset-2.0.json b/schema/subset-2.0.json index 98f39c4f3e..db256ec7fb 100644 --- a/schema/subset-2.0.json +++ b/schema/subset-2.0.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schema.org/draft-04/schema#", - "title": "pype:subset-2.0", + "title": "openpype:subset-2.0", "description": "A container of instances", "type": "object", @@ -20,8 +20,8 @@ "schema": { "description": "The schema associated with this document", "type": "string", - "enum": ["pype:subset-2.0"], - "example": "pype:subset-2.0" + "enum": ["openpype:subset-2.0"], + "example": "openpype:subset-2.0" }, "type": { "description": "The type of document", diff --git a/schema/subset-3.0.json b/schema/subset-3.0.json index a0af9d340f..1a0db53c04 100644 --- a/schema/subset-3.0.json +++ b/schema/subset-3.0.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schema.org/draft-04/schema#", - "title": "pype:subset-3.0", + "title": "openpype:subset-3.0", "description": "A container of instances", "type": "object", @@ -20,8 +20,8 @@ "schema": { "description": "The schema associated with this document", "type": "string", - "enum": ["avalon-core:subset-3.0", "pype:subset-3.0"], - "example": "pype:subset-3.0" + "enum": ["openpype:subset-3.0"], + "example": "openpype:subset-3.0" }, "type": { "description": "The type of document", @@ -51,7 +51,7 @@ } }, "example": { - "families" : [ + "families" : [ "avalon.camera" ], "frameStart": 1000, diff --git a/schema/thumbnail-1.0.json b/schema/thumbnail-1.0.json index 96b540ab7e..5bdf78a4b1 100644 --- a/schema/thumbnail-1.0.json +++ b/schema/thumbnail-1.0.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schema.org/draft-04/schema#", - "title": "pype:thumbnail-1.0", + "title": "openpype:thumbnail-1.0", "description": "Entity with thumbnail data", "type": "object", @@ -18,8 +18,8 @@ "schema": { "description": "The schema associated with this document", "type": "string", - "enum": ["pype:thumbnail-1.0"], - "example": "pype:thumbnail-1.0" + "enum": ["openpype:thumbnail-1.0"], + "example": "openpype:thumbnail-1.0" }, "type": { "description": "The type of document", diff --git a/schema/version-1.0.json b/schema/version-1.0.json index c784a25175..daa1997721 100644 --- a/schema/version-1.0.json +++ b/schema/version-1.0.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schema.org/draft-04/schema#", - "title": "pype:version-1.0", + "title": "openpype:version-1.0", "description": "An individual version", "type": "object", diff --git a/schema/version-2.0.json b/schema/version-2.0.json index 5bb4a56f96..099e9be70a 100644 --- a/schema/version-2.0.json +++ b/schema/version-2.0.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schema.org/draft-04/schema#", - "title": "pype:version-2.0", + "title": "openpype:version-2.0", "description": "An individual version", "type": "object", @@ -20,8 +20,8 @@ "schema": { "description": "The schema associated with this document", "type": "string", - "enum": ["pype:version-2.0"], - "example": "pype:version-2.0" + "enum": ["openpype:version-2.0"], + "example": "openpype:version-2.0" }, "type": { "description": "The type of document", @@ -82,10 +82,10 @@ "example": { "source" : "{root}/f02_prod/assets/BubbleWitch/work/modeling/marcus/maya/scenes/model_v001.ma", "author" : "marcus", - "families" : [ + "families" : [ "avalon.model" ], - "time" : "20170510T090203Z" + "time" : "20170510T090203Z" } } } diff --git a/schema/version-3.0.json b/schema/version-3.0.json index 808650da0d..3e07fc4499 100644 --- a/schema/version-3.0.json +++ b/schema/version-3.0.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schema.org/draft-04/schema#", - "title": "pype:version-3.0", + "title": "openpype:version-3.0", "description": "An individual version", "type": "object", @@ -20,8 +20,8 @@ "schema": { "description": "The schema associated with this document", "type": "string", - "enum": ["avalon-core:version-3.0", "pype:version-3.0"], - "example": "pype:version-3.0" + "enum": ["openpype:version-3.0"], + "example": "openpype:version-3.0" }, "type": { "description": "The type of document", @@ -77,7 +77,7 @@ "example": { "source" : "{root}/f02_prod/assets/BubbleWitch/work/modeling/marcus/maya/scenes/model_v001.ma", "author" : "marcus", - "time" : "20170510T090203Z" + "time" : "20170510T090203Z" } } } diff --git a/schema/workfile-1.0.json b/schema/workfile-1.0.json index 15bfdc6ff7..5f9600ef20 100644 --- a/schema/workfile-1.0.json +++ b/schema/workfile-1.0.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schema.org/draft-04/schema#", - "title": "pype:workfile-1.0", + "title": "openpype:workfile-1.0", "description": "Workfile additional information.", "type": "object", @@ -20,8 +20,8 @@ "schema": { "description": "Schema identifier for payload", "type": "string", - "enum": ["pype:workfile-1.0"], - "example": "pype:workfile-1.0" + "enum": ["openpype:workfile-1.0"], + "example": "openpype:workfile-1.0" }, "type": { "description": "The type of document",