Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/core_api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
location:
type: app_store
name: tk-core
version: v0.23.9
version: v0.24.1
19 changes: 19 additions & 0 deletions env/includes/common/apps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,29 @@ common.apps.tk-multi-publish2.location:
type: app_store
name: tk-multi-publish2
version: v2.11.0
# QA: Use latest branch until it is released
type: git_branch
branch: master
path: git@github.com:shotgunsoftware/tk-multi-publish2.git
version: f2317513ac756b47e4f855663567875a58a9528c
common.apps.tk-multi-loader2.location:
type: app_store
name: tk-multi-loader2
version: v1.25.6
# QA: Use latest branch until it is released
type: git_branch
branch: master
path: git@github.com:shotgunsoftware/tk-multi-loader2.git
version: 653474e14d81a3636a0c853c8ffd0246bd935fcf
common.apps.tk-multi-breakdown2.location:
type: app_store
name: tk-multi-breakdown2
version: v0.4.5
# QA: Use latest branch until it is released
type: git_branch
branch: master
path: git@github.com:shotgunsoftware/tk-multi-breakdown2.git
version: cd2ca679891979d4de440c2c78ccd33766111f84
common.apps.tk-multi-shotgunpanel.location:
type: app_store
name: tk-multi-shotgunpanel
Expand Down
17 changes: 16 additions & 1 deletion env/includes/common/engines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,29 @@ common.engines.tk-houdini.location:
type: app_store
name: tk-houdini
version: v1.9.12
# QA: Use latest branch until it is released
type: git_branch
branch: master
path: git@github.com:shotgunsoftware/tk-houdini.git
version: 13a898c4b32289f0f11be5ddf54d141719384c21
common.engines.tk-maya.location:
type: app_store
name: tk-maya
version: v0.13.11
# QA: Use latest branch until it is released
type: git_branch
branch: master
path: git@github.com:shotgunsoftware/tk-maya.git
version: 6b279ec303fd5e76699b6d206e34198872fd5280
common.engines.tk-nuke.location:
type: app_store
name: tk-nuke
version: v0.16.4
# QA: Use latest branch until it is released
type: git_branch
branch: master
path: git@github.com:shotgunsoftware/tk-nuke.git
version: 02808561cd29466fa6a3aca0e8249b99868e2a47
common.engines.tk-photoshopcc.location:
type: app_store
name: tk-photoshopcc
Expand All @@ -50,7 +65,7 @@ common.engines.tk-vred.location:
common.engines.tk-desktop.location:
type: app_store
name: tk-desktop
version: v2.8.6
version: v2.8.7
common.engines.tk-desktop2.location:
type: app_store
name: tk-desktop2
Expand Down
19 changes: 19 additions & 0 deletions env/includes/desktop/project.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,25 @@ desktop.project:
hook_before_register_command: "{config}/tk-multi-launchapp/before_register_command.py"
location: "@common.apps.tk-multi-launchapp.location"

tk-multi-loader2:
location: "@common.apps.tk-multi-loader2.location"
entities:
- caption: Current Project
type: Query
entity_type: Project
publish_filters: []
filters:
- ["id", "is", "{context.project.id}"]
hierarchy: [name]
- caption: My Tasks
type: Query
entity_type: Task
publish_filters: []
filters:
- [task_assignees, is, "{context.user}"]
- ["project", "is", "{context.project}"]
hierarchy: [entity, content]

collapse_rules:
- {button_label: $app, match: Launch $app, menu_label: None}
default_group: Studio
Expand Down
7 changes: 7 additions & 0 deletions env/includes/houdini/apps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ houdini.apps.tk-multi-publish2:
- name: Publish to Flow Production Tracking
hook: "{self}/publish_file.py:{engine}/tk-multi-publish2/basic/publish_session.py"
settings: {}
- name: Publish Alembic Derivative
hook: "{self}/publish_file.py:{engine}/tk-multi-publish2/basic/publish_session.py:{self}/flowam/publish_alembic_derivative.py"
settings: {}
location: "@common.apps.tk-multi-publish2.location"

houdini.apps.tk-multi-loader2:
Expand Down Expand Up @@ -93,3 +96,7 @@ houdini.apps.tk-multi-shotgunpanel:
filters: {}
enable_context_switch: true
location: "@common.apps.tk-multi-shotgunpanel.location"

houdini.apps.tk-multi-breakdown2:
location: "@common.apps.tk-multi-breakdown2.location"
panel_mode: False
2 changes: 2 additions & 0 deletions env/includes/houdini/asset_step.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ houdini.asset_step:

tk-multi-shotgunpanel: '@houdini.apps.tk-multi-shotgunpanel'

tk-multi-breakdown2: '@houdini.apps.tk-multi-breakdown2'

location: "@common.engines.tk-houdini.location"
menu_favourites: []
run_at_startup:
Expand Down
2 changes: 2 additions & 0 deletions env/includes/houdini/project.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ houdini.project:

tk-multi-shotgunpanel: '@houdini.apps.tk-multi-shotgunpanel'

tk-multi-breakdown2: '@houdini.apps.tk-multi-breakdown2'

location: "@common.engines.tk-houdini.location"
menu_favourites: []
run_at_startup:
Expand Down
2 changes: 2 additions & 0 deletions env/includes/houdini/shot_step.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ houdini.shot_step:

tk-multi-shotgunpanel: '@houdini.apps.tk-multi-shotgunpanel'

tk-multi-breakdown2: '@houdini.apps.tk-multi-breakdown2'

location: "@common.engines.tk-houdini.location"
menu_favourites: []
run_at_startup:
Expand Down
7 changes: 7 additions & 0 deletions env/includes/maya/apps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ maya.apps.tk-multi-publish2:
- name: Publish to Flow Production Tracking
hook: "{self}/publish_file.py:{engine}/tk-multi-publish2/basic/publish_session.py"
settings: {}
- name: Publish Alembic Derivative
hook: "{self}/publish_file.py:{engine}/tk-multi-publish2/basic/publish_session.py:{self}/flowam/publish_alembic_derivative.py"
settings: {}
location: "@common.apps.tk-multi-publish2.location"

maya.apps.tk-multi-loader2:
Expand Down Expand Up @@ -93,3 +96,7 @@ maya.apps.tk-multi-reviewsubmission:
render_media_hook: '{self}/render_media.py:{self}/{engine_name}/render_media.py'
submitter_hook: '{self}/submitter_create.py'
location: "@common.apps.tk-multi-reviewsubmission.location"

maya.apps.tk-multi-breakdown2:
location: "@common.apps.tk-multi-breakdown2.location"
panel_mode: False
2 changes: 2 additions & 0 deletions env/includes/maya/asset_step.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ maya.asset_step:

tk-multi-reviewsubmission: '@maya.apps.tk-multi-reviewsubmission'

tk-multi-breakdown2: '@maya.apps.tk-multi-breakdown2'

location: "@common.engines.tk-maya.location"
menu_favourites: []
run_at_startup:
Expand Down
2 changes: 2 additions & 0 deletions env/includes/maya/project.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ maya.project:

tk-multi-shotgunpanel: '@maya.apps.tk-multi-shotgunpanel'

tk-multi-breakdown2: '@maya.apps.tk-multi-breakdown2'

location: "@common.engines.tk-maya.location"
menu_favourites: []
run_at_startup:
Expand Down
2 changes: 2 additions & 0 deletions env/includes/maya/shot_step.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ maya.shot_step:

tk-multi-reviewsubmission: '@maya.apps.tk-multi-reviewsubmission'

tk-multi-breakdown2: '@maya.apps.tk-multi-breakdown2'

location: "@common.engines.tk-maya.location"
menu_favourites: []
run_at_startup:
Expand Down
11 changes: 10 additions & 1 deletion env/includes/nuke/apps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,10 @@ nuke.apps.tk-multi-publish2:
help_url: "@common.apps.tk-multi-publish2.help_url"
collector: "{self}/collector.py:{engine}/tk-multi-publish2/basic/collector.py"
publish_plugins:
- '@common.settings.tk-multi-publish2.publish_file'
- '@common.settings.tk-multi-publish2.upload_version'
- name: Publish to Flow Production Tracking # replaces '@common.settings.tk-multi-publish2.publish_file'
hook: "{self}/publish_file.py:{engine}/tk-multi-publish2/basic/nuke_publish_file.py"
settings: {}
- name: Begin file versioning
hook: "{engine}/tk-multi-publish2/basic/nuke_start_version_control.py"
settings: {}
Expand All @@ -32,6 +34,9 @@ nuke.apps.tk-multi-publish2:
- name: Publish to Flow Production Tracking
hook: "{self}/publish_file.py:{engine}/tk-multi-publish2/basic/nuke_publish_script.py"
settings: {}
- name: Publish FlowWrite Renders to Flow AM
hook: "{self}/publish_file.py:{engine}/tk-multi-publish2/basic/nuke_flow_write_publish_script.py"
settings: {}
- name: Publish to Flow Production Tracking
hook: "{self}/publish_file.py:{engine}/tk-multi-publish2/basic/nukestudio_publish_project.py"
settings: {}
Expand Down Expand Up @@ -181,3 +186,7 @@ nukestudio.apps.tk-multi-shotgunpanel:

nuke.apps.tk-nuke-quickreview:
location: "@common.apps.tk-nuke-quickreview.location"

nuke.apps.tk-multi-breakdown2:
location: "@common.apps.tk-multi-breakdown2.location"
panel_mode: False
2 changes: 2 additions & 0 deletions env/includes/nuke/asset_step.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ nuke.asset_step:

tk-nuke-quickreview: '@nuke.apps.tk-nuke-quickreview'

tk-multi-breakdown2: '@nuke.apps.tk-multi-breakdown2'

location: "@common.engines.tk-nuke.location"
menu_favourites: []
run_at_startup:
Expand Down
2 changes: 2 additions & 0 deletions env/includes/nuke/project.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ nuke.project:

tk-nuke-quickreview: '@nuke.apps.tk-nuke-quickreview'

tk-multi-breakdown2: '@nuke.apps.tk-multi-breakdown2'

location: "@common.engines.tk-nuke.location"
menu_favourites: []
run_at_startup:
Expand Down
2 changes: 2 additions & 0 deletions env/includes/nuke/shot_step.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ nuke.shot_step:

tk-nuke-quickreview: '@nuke.apps.tk-nuke-quickreview'

tk-multi-breakdown2: '@nuke.apps.tk-multi-breakdown2'

location: "@common.engines.tk-nuke.location"
menu_favourites: []
run_at_startup:
Expand Down