Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 15 additions & 0 deletions env/includes/app_locations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,11 @@ 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
apps.tk-multi-data-validation.location:
type: app_store
name: tk-multi-data-validation
Expand All @@ -48,10 +53,20 @@ 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
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
apps.tk-multi-pythonconsole.location:
type: app_store
name: tk-multi-pythonconsole
Expand Down
20 changes: 20 additions & 0 deletions env/includes/engine_locations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,11 @@ engines.tk-desktop.location:
type: app_store
name: tk-desktop
version: v2.8.6
# QA: Use latest branch until it is released
type: git_branch
branch: master
path: git@github.com:shotgunsoftware/tk-desktop.git
version: c528bccf01fc1c35e1f676f70bf532a42273b1b6
engines.tk-desktop2.location:
type: app_store
name: tk-desktop2
Expand All @@ -41,6 +46,11 @@ 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
engines.tk-mari.location:
type: app_store
name: tk-mari
Expand All @@ -49,6 +59,11 @@ 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
engines.tk-motionbuilder.location:
type: app_store
name: tk-motionbuilder
Expand All @@ -57,6 +72,11 @@ 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
engines.tk-photoshopcc.location:
type: app_store
name: tk-photoshopcc
Expand Down
2 changes: 2 additions & 0 deletions env/includes/settings/tk-desktop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ includes:
- ./tk-multi-launchapp.yml
- ./tk-multi-publish2.yml
- ./tk-multi-screeningroom.yml
- ./tk-multi-loader2.yml

################################################################################

Expand All @@ -39,6 +40,7 @@ settings.tk-desktop.project:
tk-multi-launchmotionbuilder: "@settings.tk-multi-launchapp.motionbuilder"
tk-multi-publish2: "@settings.tk-multi-publish2.standalone"
tk-multi-screeningroom: "@settings.tk-multi-screeningroom.rv"
tk-multi-loader2: "@settings.tk-multi-loader2.standalone"
groups:
- matches:
- "*Fla*"
Expand Down
1 change: 1 addition & 0 deletions env/includes/settings/tk-houdini.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ settings.tk-houdini.project:
location: "@apps.tk-multi-about.location"
tk-multi-screeningroom: "@settings.tk-multi-screeningroom.rv"
tk-multi-shotgunpanel: "@settings.tk-multi-shotgunpanel"
tk-multi-loader2: "@settings.tk-multi-loader2.houdini" # Display loader on project context
tk-multi-workfiles2: "@settings.tk-multi-workfiles2.houdini"
menu_favourites:
- {app_instance: tk-multi-workfiles2, name: File Open...}
Expand Down
1 change: 1 addition & 0 deletions env/includes/settings/tk-maya.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ settings.tk-maya.project:
location: "@apps.tk-multi-about.location"
tk-multi-screeningroom: "@settings.tk-multi-screeningroom.rv"
tk-multi-shotgunpanel: "@settings.tk-multi-shotgunpanel"
tk-multi-loader2: "@settings.tk-multi-loader2.maya" # Display loader on project context
tk-multi-workfiles2: "@settings.tk-multi-workfiles2.launch_at_startup"
menu_favourites:
- {app_instance: tk-multi-workfiles2, name: File Open...}
Expand Down
32 changes: 32 additions & 0 deletions env/includes/settings/tk-multi-loader2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,10 @@ settings.tk-multi-loader2.houdini:
Rendered Image: [file_cop]
Texture: [file_cop]
entities:
- caption: Current Project
type: Hierarchy
root: "{context.project}"
publish_filters: []
- caption: Assets
entity_type: Asset
filters:
Expand Down Expand Up @@ -131,6 +135,10 @@ settings.tk-multi-loader2.maya:
Rendered Image: [texture_node, image_plane]
Texture: [texture_node, image_plane]
entities:
- caption: Current Project
type: Hierarchy
root: "{context.project}"
publish_filters: []
- caption: Assets
entity_type: Asset
filters:
Expand Down Expand Up @@ -168,6 +176,10 @@ settings.tk-multi-loader2.nuke:
Rendered Image: [read_node]
Texture: [read_node]
entities:
- caption: Current Project
type: Hierarchy
root: "{context.project}"
publish_filters: []
- caption: Assets
entity_type: Asset
filters:
Expand Down Expand Up @@ -419,3 +431,23 @@ settings.tk-multi-loader2.vred:
actions_hook: "{engine}/tk-multi-loader2/basic/scene_actions.py"
publish_filters: [["sg_status_list", "is_not", null]]
location: "@apps.tk-multi-loader2.location"

# desktop standalone Flow AM
settings.tk-multi-loader2.standalone:
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]
location: "@apps.tk-multi-loader2.location"
12 changes: 12 additions & 0 deletions env/includes/settings/tk-multi-publish2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,9 @@ settings.tk-multi-publish2.houdini.asset_step:
hook: "{self}/publish_file.py:{engine}/tk-multi-publish2/basic/publish_session.py"
settings:
Publish Template: houdini_asset_publish
- name: Publish Alembic Derivative
hook: "{self}/publish_file.py:{engine}/tk-multi-publish2/basic/publish_session.py:{self}/flowam/publish_alembic_derivative.py"
settings: {}
help_url: *help_url
location: "@apps.tk-multi-publish2.location"

Expand All @@ -130,6 +133,9 @@ settings.tk-multi-publish2.houdini.shot_step:
hook: "{self}/publish_file.py:{engine}/tk-multi-publish2/basic/publish_session.py"
settings:
Publish Template: houdini_shot_publish
- name: Publish Alembic Derivative
hook: "{self}/publish_file.py:{engine}/tk-multi-publish2/basic/publish_session.py:{self}/flowam/publish_alembic_derivative.py"
settings: {}
help_url: *help_url
location: "@apps.tk-multi-publish2.location"

Expand Down Expand Up @@ -181,6 +187,9 @@ settings.tk-multi-publish2.maya.asset_step:
hook: "{self}/publish_file.py:{engine}/tk-multi-publish2/basic/publish_session_geometry.py"
settings:
Publish Template: asset_alembic_cache
- name: Publish Alembic Derivative
hook: "{self}/publish_file.py:{engine}/tk-multi-publish2/basic/publish_session.py:{self}/flowam/publish_alembic_derivative.py"
settings: {}
help_url: *help_url
location: "@apps.tk-multi-publish2.location"

Expand All @@ -203,6 +212,9 @@ settings.tk-multi-publish2.maya.shot_step:
hook: "{self}/publish_file.py:{engine}/tk-multi-publish2/basic/publish_session.py"
settings:
Publish Template: maya_shot_publish
- name: Publish Alembic Derivative
hook: "{self}/publish_file.py:{engine}/tk-multi-publish2/basic/publish_session.py:{self}/flowam/publish_alembic_derivative.py"
settings: {}
help_url: *help_url
location: "@apps.tk-multi-publish2.location"

Expand Down
1 change: 1 addition & 0 deletions env/includes/settings/tk-nuke.yml
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ settings.tk-nuke.project:
location: "@apps.tk-multi-about.location"
tk-multi-screeningroom: "@settings.tk-multi-screeningroom.rv"
tk-multi-shotgunpanel: "@settings.tk-multi-shotgunpanel"
tk-multi-loader2: "@settings.tk-multi-loader2.nuke" # Display loader on project context
tk-multi-workfiles2: "@settings.tk-multi-workfiles2"
tk-nuke-quickreview:
location: "@apps.tk-nuke-quickreview.location"
Expand Down
Loading