From acda8b18952f0cb948ac3abc8ebbf677b65ef317 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 3 Sep 2020 19:12:09 +0200 Subject: [PATCH] Fixed issue when making shot file in Houdini to not be able to create files. Changed review folders. --- .../03_caches/asset/{step => }/placeholder | 0 .../04_publish/03_caches/asset/step.yml | 15 ----------- .../schema/project/05_review/assets/asset.yml | 26 ------------------- .../project/05_review/assets/asset/step.yml | 15 ----------- .../05_review/assets/asset/step/3dsmax.yml | 15 ----------- .../05_review/assets/asset/step/alias.yml | 15 ----------- .../assets/asset/step/caches/placeholder | 4 --- .../assets/asset/step/elements/placeholder | 4 --- .../05_review/assets/asset/step/houdini.yml | 15 ----------- .../assets/asset/step/houdini/placeholder | 4 --- .../assets/asset/step/mari/placeholder | 4 --- .../05_review/assets/asset/step/maya.yml | 15 ----------- .../assets/asset/step/maya/placeholder | 4 --- .../05_review/assets/asset/step/mobu.yml | 15 ----------- .../assets/asset/step/mobu/placeholder | 4 --- .../05_review/assets/asset/step/nuke.yml | 15 ----------- .../assets/asset/step/nuke/placeholder | 4 --- .../05_review/assets/asset/step/photoshop.yml | 15 ----------- .../assets/asset/step/photoshop/placeholder | 4 --- .../05_review/assets/asset/step/vred.yml | 15 ----------- .../assets/asset/step/vred/placeholder | 4 --- .../{asset/step/3dsmax => }/placeholder | 0 .../asset/step/alias => shots}/placeholder | 0 core/schema/project/05_review/shots/shot.yml | 25 ------------------ .../project/05_review/shots/shot/placeholder | 0 core/templates.yml | 4 +-- 26 files changed, 2 insertions(+), 239 deletions(-) rename core/schema/project/04_publish/03_caches/asset/{step => }/placeholder (100%) delete mode 100644 core/schema/project/04_publish/03_caches/asset/step.yml delete mode 100644 core/schema/project/05_review/assets/asset.yml delete mode 100644 core/schema/project/05_review/assets/asset/step.yml delete mode 100644 core/schema/project/05_review/assets/asset/step/3dsmax.yml delete mode 100644 core/schema/project/05_review/assets/asset/step/alias.yml delete mode 100644 core/schema/project/05_review/assets/asset/step/caches/placeholder delete mode 100644 core/schema/project/05_review/assets/asset/step/elements/placeholder delete mode 100644 core/schema/project/05_review/assets/asset/step/houdini.yml delete mode 100644 core/schema/project/05_review/assets/asset/step/houdini/placeholder delete mode 100644 core/schema/project/05_review/assets/asset/step/mari/placeholder delete mode 100644 core/schema/project/05_review/assets/asset/step/maya.yml delete mode 100644 core/schema/project/05_review/assets/asset/step/maya/placeholder delete mode 100644 core/schema/project/05_review/assets/asset/step/mobu.yml delete mode 100644 core/schema/project/05_review/assets/asset/step/mobu/placeholder delete mode 100644 core/schema/project/05_review/assets/asset/step/nuke.yml delete mode 100644 core/schema/project/05_review/assets/asset/step/nuke/placeholder delete mode 100644 core/schema/project/05_review/assets/asset/step/photoshop.yml delete mode 100644 core/schema/project/05_review/assets/asset/step/photoshop/placeholder delete mode 100644 core/schema/project/05_review/assets/asset/step/vred.yml delete mode 100644 core/schema/project/05_review/assets/asset/step/vred/placeholder rename core/schema/project/05_review/assets/{asset/step/3dsmax => }/placeholder (100%) rename core/schema/project/05_review/{assets/asset/step/alias => shots}/placeholder (100%) delete mode 100644 core/schema/project/05_review/shots/shot.yml delete mode 100644 core/schema/project/05_review/shots/shot/placeholder diff --git a/core/schema/project/04_publish/03_caches/asset/step/placeholder b/core/schema/project/04_publish/03_caches/asset/placeholder similarity index 100% rename from core/schema/project/04_publish/03_caches/asset/step/placeholder rename to core/schema/project/04_publish/03_caches/asset/placeholder diff --git a/core/schema/project/04_publish/03_caches/asset/step.yml b/core/schema/project/04_publish/03_caches/asset/step.yml deleted file mode 100644 index f8d188fc6..000000000 --- a/core/schema/project/04_publish/03_caches/asset/step.yml +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright (c) 2015 Shotgun Software Inc. -# -# CONFIDENTIAL AND PROPRIETARY -# -# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit -# Source Code License included in this distribution package. See LICENSE. -# By accessing, using, copying or modifying this work you indicate your -# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights -# not expressly granted therein are reserved by Shotgun Software Inc. - -# the type of dynamic content -type: "shotgun_step" - -# the shotgun field to use for the folder name -name: "short_name" diff --git a/core/schema/project/05_review/assets/asset.yml b/core/schema/project/05_review/assets/asset.yml deleted file mode 100644 index 79a897608..000000000 --- a/core/schema/project/05_review/assets/asset.yml +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright (c) 2015 Shotgun Software Inc. -# -# CONFIDENTIAL AND PROPRIETARY -# -# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit -# Source Code License included in this distribution package. See LICENSE. -# By accessing, using, copying or modifying this work you indicate your -# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights -# not expressly granted therein are reserved by Shotgun Software Inc. - -# the type of dynamic content -type: "shotgun_entity" - -# the shotgun field to use for the folder name -name: "code" - -# the shotgun entity type to connect to -entity_type: "Asset" - -# shotgun filters to apply when getting the list of items -# this should be a list of dicts, each dict containing -# three fields: path, relation and values -# (this is std shotgun API syntax) -# any values starting with $ are resolved into path objects -filters: - - { "path": "project", "relation": "is", "values": [ "$project" ] } diff --git a/core/schema/project/05_review/assets/asset/step.yml b/core/schema/project/05_review/assets/asset/step.yml deleted file mode 100644 index f8d188fc6..000000000 --- a/core/schema/project/05_review/assets/asset/step.yml +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright (c) 2015 Shotgun Software Inc. -# -# CONFIDENTIAL AND PROPRIETARY -# -# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit -# Source Code License included in this distribution package. See LICENSE. -# By accessing, using, copying or modifying this work you indicate your -# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights -# not expressly granted therein are reserved by Shotgun Software Inc. - -# the type of dynamic content -type: "shotgun_step" - -# the shotgun field to use for the folder name -name: "short_name" diff --git a/core/schema/project/05_review/assets/asset/step/3dsmax.yml b/core/schema/project/05_review/assets/asset/step/3dsmax.yml deleted file mode 100644 index 8ca4a5497..000000000 --- a/core/schema/project/05_review/assets/asset/step/3dsmax.yml +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright (c) 2015 Shotgun Software Inc. -# -# CONFIDENTIAL AND PROPRIETARY -# -# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit -# Source Code License included in this distribution package. See LICENSE. -# By accessing, using, copying or modifying this work you indicate your -# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights -# not expressly granted therein are reserved by Shotgun Software Inc. - -# the type of dynamic content -type: "static" - -# defer creation and only create this folder when 3dsmax starts -defer_creation: ["tk-3dsmax", "tk-3dsmaxplus"] diff --git a/core/schema/project/05_review/assets/asset/step/alias.yml b/core/schema/project/05_review/assets/asset/step/alias.yml deleted file mode 100644 index aa449c38c..000000000 --- a/core/schema/project/05_review/assets/asset/step/alias.yml +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright (c) 2015 Shotgun Software Inc. -# -# CONFIDENTIAL AND PROPRIETARY -# -# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit -# Source Code License included in this distribution package. See LICENSE. -# By accessing, using, copying or modifying this work you indicate your -# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights -# not expressly granted therein are reserved by Shotgun Software Inc. - -# the type of dynamic content -type: "static" - -# defer creation and only create this folder when Nuke starts -defer_creation: "tk-alias" diff --git a/core/schema/project/05_review/assets/asset/step/caches/placeholder b/core/schema/project/05_review/assets/asset/step/caches/placeholder deleted file mode 100644 index 6ce76a9e1..000000000 --- a/core/schema/project/05_review/assets/asset/step/caches/placeholder +++ /dev/null @@ -1,4 +0,0 @@ -# This file is a placeholder to ensure that the parent folder is preserved and not deleted by git. -# Any file named 'placeholder' will not be copied across when folders are created. -# Note: You can which files should be ignored when folders are created in the ignore_files file, -# located in the schema folder. diff --git a/core/schema/project/05_review/assets/asset/step/elements/placeholder b/core/schema/project/05_review/assets/asset/step/elements/placeholder deleted file mode 100644 index 6ce76a9e1..000000000 --- a/core/schema/project/05_review/assets/asset/step/elements/placeholder +++ /dev/null @@ -1,4 +0,0 @@ -# This file is a placeholder to ensure that the parent folder is preserved and not deleted by git. -# Any file named 'placeholder' will not be copied across when folders are created. -# Note: You can which files should be ignored when folders are created in the ignore_files file, -# located in the schema folder. diff --git a/core/schema/project/05_review/assets/asset/step/houdini.yml b/core/schema/project/05_review/assets/asset/step/houdini.yml deleted file mode 100644 index 4acdbad5c..000000000 --- a/core/schema/project/05_review/assets/asset/step/houdini.yml +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright (c) 2015 Shotgun Software Inc. -# -# CONFIDENTIAL AND PROPRIETARY -# -# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit -# Source Code License included in this distribution package. See LICENSE. -# By accessing, using, copying or modifying this work you indicate your -# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights -# not expressly granted therein are reserved by Shotgun Software Inc. - -# the type of dynamic content -type: "static" - -# defer creation and only create this folder when Houdini starts -defer_creation: "tk-houdini" diff --git a/core/schema/project/05_review/assets/asset/step/houdini/placeholder b/core/schema/project/05_review/assets/asset/step/houdini/placeholder deleted file mode 100644 index 6ce76a9e1..000000000 --- a/core/schema/project/05_review/assets/asset/step/houdini/placeholder +++ /dev/null @@ -1,4 +0,0 @@ -# This file is a placeholder to ensure that the parent folder is preserved and not deleted by git. -# Any file named 'placeholder' will not be copied across when folders are created. -# Note: You can which files should be ignored when folders are created in the ignore_files file, -# located in the schema folder. diff --git a/core/schema/project/05_review/assets/asset/step/mari/placeholder b/core/schema/project/05_review/assets/asset/step/mari/placeholder deleted file mode 100644 index 6ce76a9e1..000000000 --- a/core/schema/project/05_review/assets/asset/step/mari/placeholder +++ /dev/null @@ -1,4 +0,0 @@ -# This file is a placeholder to ensure that the parent folder is preserved and not deleted by git. -# Any file named 'placeholder' will not be copied across when folders are created. -# Note: You can which files should be ignored when folders are created in the ignore_files file, -# located in the schema folder. diff --git a/core/schema/project/05_review/assets/asset/step/maya.yml b/core/schema/project/05_review/assets/asset/step/maya.yml deleted file mode 100644 index a44c5e4d2..000000000 --- a/core/schema/project/05_review/assets/asset/step/maya.yml +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright (c) 2015 Shotgun Software Inc. -# -# CONFIDENTIAL AND PROPRIETARY -# -# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit -# Source Code License included in this distribution package. See LICENSE. -# By accessing, using, copying or modifying this work you indicate your -# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights -# not expressly granted therein are reserved by Shotgun Software Inc. - -# the type of dynamic content -type: "static" - -# defer creation and only create this folder when Maya starts -defer_creation: "tk-maya" diff --git a/core/schema/project/05_review/assets/asset/step/maya/placeholder b/core/schema/project/05_review/assets/asset/step/maya/placeholder deleted file mode 100644 index 6ce76a9e1..000000000 --- a/core/schema/project/05_review/assets/asset/step/maya/placeholder +++ /dev/null @@ -1,4 +0,0 @@ -# This file is a placeholder to ensure that the parent folder is preserved and not deleted by git. -# Any file named 'placeholder' will not be copied across when folders are created. -# Note: You can which files should be ignored when folders are created in the ignore_files file, -# located in the schema folder. diff --git a/core/schema/project/05_review/assets/asset/step/mobu.yml b/core/schema/project/05_review/assets/asset/step/mobu.yml deleted file mode 100644 index ab1bf9592..000000000 --- a/core/schema/project/05_review/assets/asset/step/mobu.yml +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright (c) 2015 Shotgun Software Inc. -# -# CONFIDENTIAL AND PROPRIETARY -# -# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit -# Source Code License included in this distribution package. See LICENSE. -# By accessing, using, copying or modifying this work you indicate your -# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights -# not expressly granted therein are reserved by Shotgun Software Inc. - -# the type of dynamic content -type: "static" - -# defer creation and only create this folder when Motion Builder starts -defer_creation: "tk-motionbuilder" diff --git a/core/schema/project/05_review/assets/asset/step/mobu/placeholder b/core/schema/project/05_review/assets/asset/step/mobu/placeholder deleted file mode 100644 index 6ce76a9e1..000000000 --- a/core/schema/project/05_review/assets/asset/step/mobu/placeholder +++ /dev/null @@ -1,4 +0,0 @@ -# This file is a placeholder to ensure that the parent folder is preserved and not deleted by git. -# Any file named 'placeholder' will not be copied across when folders are created. -# Note: You can which files should be ignored when folders are created in the ignore_files file, -# located in the schema folder. diff --git a/core/schema/project/05_review/assets/asset/step/nuke.yml b/core/schema/project/05_review/assets/asset/step/nuke.yml deleted file mode 100644 index 6657bd425..000000000 --- a/core/schema/project/05_review/assets/asset/step/nuke.yml +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright (c) 2015 Shotgun Software Inc. -# -# CONFIDENTIAL AND PROPRIETARY -# -# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit -# Source Code License included in this distribution package. See LICENSE. -# By accessing, using, copying or modifying this work you indicate your -# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights -# not expressly granted therein are reserved by Shotgun Software Inc. - -# the type of dynamic content -type: "static" - -# defer creation and only create this folder when Nuke starts -defer_creation: "tk-nuke" diff --git a/core/schema/project/05_review/assets/asset/step/nuke/placeholder b/core/schema/project/05_review/assets/asset/step/nuke/placeholder deleted file mode 100644 index 6ce76a9e1..000000000 --- a/core/schema/project/05_review/assets/asset/step/nuke/placeholder +++ /dev/null @@ -1,4 +0,0 @@ -# This file is a placeholder to ensure that the parent folder is preserved and not deleted by git. -# Any file named 'placeholder' will not be copied across when folders are created. -# Note: You can which files should be ignored when folders are created in the ignore_files file, -# located in the schema folder. diff --git a/core/schema/project/05_review/assets/asset/step/photoshop.yml b/core/schema/project/05_review/assets/asset/step/photoshop.yml deleted file mode 100644 index 17a6b393d..000000000 --- a/core/schema/project/05_review/assets/asset/step/photoshop.yml +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright (c) 2015 Shotgun Software Inc. -# -# CONFIDENTIAL AND PROPRIETARY -# -# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit -# Source Code License included in this distribution package. See LICENSE. -# By accessing, using, copying or modifying this work you indicate your -# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights -# not expressly granted therein are reserved by Shotgun Software Inc. - -# the type of dynamic content -type: "static" - -# defer creation and only create this folder when Photoshop starts -defer_creation: "tk-photoshopcc" diff --git a/core/schema/project/05_review/assets/asset/step/photoshop/placeholder b/core/schema/project/05_review/assets/asset/step/photoshop/placeholder deleted file mode 100644 index 6ce76a9e1..000000000 --- a/core/schema/project/05_review/assets/asset/step/photoshop/placeholder +++ /dev/null @@ -1,4 +0,0 @@ -# This file is a placeholder to ensure that the parent folder is preserved and not deleted by git. -# Any file named 'placeholder' will not be copied across when folders are created. -# Note: You can which files should be ignored when folders are created in the ignore_files file, -# located in the schema folder. diff --git a/core/schema/project/05_review/assets/asset/step/vred.yml b/core/schema/project/05_review/assets/asset/step/vred.yml deleted file mode 100644 index 487af0706..000000000 --- a/core/schema/project/05_review/assets/asset/step/vred.yml +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright (c) 2015 Shotgun Software Inc. -# -# CONFIDENTIAL AND PROPRIETARY -# -# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit -# Source Code License included in this distribution package. See LICENSE. -# By accessing, using, copying or modifying this work you indicate your -# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights -# not expressly granted therein are reserved by Shotgun Software Inc. - -# the type of dynamic content -type: "static" - -# defer creation and only create this folder when Nuke starts -defer_creation: "tk-vred" diff --git a/core/schema/project/05_review/assets/asset/step/vred/placeholder b/core/schema/project/05_review/assets/asset/step/vred/placeholder deleted file mode 100644 index 6ce76a9e1..000000000 --- a/core/schema/project/05_review/assets/asset/step/vred/placeholder +++ /dev/null @@ -1,4 +0,0 @@ -# This file is a placeholder to ensure that the parent folder is preserved and not deleted by git. -# Any file named 'placeholder' will not be copied across when folders are created. -# Note: You can which files should be ignored when folders are created in the ignore_files file, -# located in the schema folder. diff --git a/core/schema/project/05_review/assets/asset/step/3dsmax/placeholder b/core/schema/project/05_review/assets/placeholder similarity index 100% rename from core/schema/project/05_review/assets/asset/step/3dsmax/placeholder rename to core/schema/project/05_review/assets/placeholder diff --git a/core/schema/project/05_review/assets/asset/step/alias/placeholder b/core/schema/project/05_review/shots/placeholder similarity index 100% rename from core/schema/project/05_review/assets/asset/step/alias/placeholder rename to core/schema/project/05_review/shots/placeholder diff --git a/core/schema/project/05_review/shots/shot.yml b/core/schema/project/05_review/shots/shot.yml deleted file mode 100644 index 9339f317e..000000000 --- a/core/schema/project/05_review/shots/shot.yml +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright (c) 2015 Shotgun Software Inc. -# -# CONFIDENTIAL AND PROPRIETARY -# -# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit -# Source Code License included in this distribution package. See LICENSE. -# By accessing, using, copying or modifying this work you indicate your -# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights -# not expressly granted therein are reserved by Shotgun Software Inc. - -# the type of dynamic content -type: "shotgun_entity" - -# the shotgun field to use for the folder name -name: "code" - -# the shotgun entity type to connect to -entity_type: "Shot" - -# shotgun filters to apply when getting the list of items -# this should be a list of dicts, each dict containing -# three fields: path, relation and values -# (this is std shotgun API syntax) -# any values starting with $ are resolved into path objects -filters: [] diff --git a/core/schema/project/05_review/shots/shot/placeholder b/core/schema/project/05_review/shots/shot/placeholder deleted file mode 100644 index e69de29bb..000000000 diff --git a/core/templates.yml b/core/templates.yml index 7d47ca635..7c93a38d4 100644 --- a/core/templates.yml +++ b/core/templates.yml @@ -199,8 +199,8 @@ paths: alembic_caches_pub: 04_publish/03_caches/{Asset}/{Step} - asset_review: 04_review/assets/{Asset}/{Step} - shot_review: 04_review/shots/{Shot} + asset_review: 05_review/assets + shot_review: 05_review/shots cg_assetrender: 06_renders/cg/assets/{Asset}/{Step} cg_shotrender: 06_renders/cg/shots/{Sequence}/{Shot}