Merge tag 'v1.3.19' of https://github.com/shotgunsoftware/tk-config-default2 into release/v1.3.19.1
# Conflicts: # env/includes/engine_locations.yml # env/includes/settings/tk-shotgun.yml
This commit is contained in:
mojibola obadimeji
Коммит
17afe2681e
|
|
@ -14,4 +14,4 @@
|
|||
location:
|
||||
type: app_store
|
||||
name: tk-core
|
||||
version: v0.19.17
|
||||
version: v0.19.19
|
||||
|
|
|
|||
|
|
@ -26,6 +26,8 @@ class PickEnvironment(Hook):
|
|||
return "version"
|
||||
elif context.source_entity["type"] == "PublishedFile":
|
||||
return "publishedfile"
|
||||
elif context.source_entity["type"] == "Playlist":
|
||||
return "playlist"
|
||||
|
||||
if context.project is None:
|
||||
# Our context is completely empty. We're going into the site context.
|
||||
|
|
|
|||
|
|
@ -23,13 +23,13 @@ includes:
|
|||
apps.tk-multi-about.location:
|
||||
type: app_store
|
||||
name: tk-multi-about
|
||||
version: v0.3.2
|
||||
version: v0.3.3
|
||||
|
||||
# breakdown
|
||||
apps.tk-multi-breakdown.location:
|
||||
type: app_store
|
||||
name: tk-multi-breakdown
|
||||
version: v1.7.2
|
||||
version: v1.7.3
|
||||
|
||||
# demo
|
||||
apps.tk-multi-demo.location:
|
||||
|
|
@ -47,7 +47,7 @@ apps.tk-multi-launchapp.location:
|
|||
apps.tk-multi-loader2.location:
|
||||
type: app_store
|
||||
name: tk-multi-loader2
|
||||
version: v1.20.2
|
||||
version: v1.20.3
|
||||
|
||||
# publish2
|
||||
apps.tk-multi-publish2.location:
|
||||
|
|
@ -59,7 +59,7 @@ apps.tk-multi-publish2.location:
|
|||
apps.tk-multi-pythonconsole.location:
|
||||
type: app_store
|
||||
name: tk-multi-pythonconsole
|
||||
version: v1.2.4
|
||||
version: v1.2.5
|
||||
|
||||
# reviewsubmission
|
||||
apps.tk-multi-reviewsubmission.location:
|
||||
|
|
@ -101,7 +101,7 @@ apps.tk-multi-workfiles.location:
|
|||
apps.tk-multi-workfiles2.location:
|
||||
type: app_store
|
||||
name: tk-multi-workfiles2
|
||||
version: v0.12.5
|
||||
version: v0.12.6
|
||||
|
||||
# dev utils
|
||||
apps.tk-multi-devutils.location:
|
||||
|
|
@ -127,13 +127,13 @@ apps.tk-shotgun-launchfolder.location:
|
|||
apps.tk-shotgun-launchpublish.location:
|
||||
type: app_store
|
||||
name: tk-shotgun-launchpublish
|
||||
version: v0.4.0
|
||||
version: v0.4.1
|
||||
|
||||
# shotgun launchvredreview
|
||||
apps.tk-shotgun-launchvredreview.location:
|
||||
type: app_store
|
||||
name: tk-shotgun-launchvredreview
|
||||
version: v1.0.0
|
||||
version: v1.0.1
|
||||
|
||||
# ---- Hiero apps
|
||||
|
||||
|
|
@ -141,13 +141,13 @@ apps.tk-shotgun-launchvredreview.location:
|
|||
apps.tk-hiero-export.location:
|
||||
type: app_store
|
||||
name: tk-hiero-export
|
||||
version: v0.5.3
|
||||
version: v0.6.0
|
||||
|
||||
# hiero openinshotgun
|
||||
apps.tk-hiero-openinshotgun.location:
|
||||
type: app_store
|
||||
name: tk-hiero-openinshotgun
|
||||
version: v0.3.4
|
||||
version: v0.3.5
|
||||
|
||||
# ---- Houdini apps
|
||||
|
||||
|
|
@ -169,13 +169,13 @@ apps.tk-houdini-mantranode.location:
|
|||
apps.tk-nuke-quickreview.location:
|
||||
type: app_store
|
||||
name: tk-nuke-quickreview
|
||||
version: v1.0.3
|
||||
version: v1.1.0
|
||||
|
||||
# writenode
|
||||
apps.tk-nuke-writenode.location:
|
||||
name: tk-nuke-writenode
|
||||
type: app_store
|
||||
version: v1.4.2
|
||||
version: v1.5.0
|
||||
|
||||
# ---- Flame apps
|
||||
|
||||
|
|
@ -183,13 +183,13 @@ apps.tk-nuke-writenode.location:
|
|||
apps.tk-flame-export.location:
|
||||
name: tk-flame-export
|
||||
type: app_store
|
||||
version: v1.9.3
|
||||
version: v1.10.1
|
||||
|
||||
# flame review
|
||||
apps.tk-flame-review.location:
|
||||
name: tk-flame-review
|
||||
type: app_store
|
||||
version: v1.3.0
|
||||
version: v1.4.1
|
||||
|
||||
# ---- Mari apps
|
||||
|
||||
|
|
|
|||
|
|
@ -17,30 +17,30 @@
|
|||
engines.tk-3dsmaxplus.location:
|
||||
type: app_store
|
||||
name: tk-3dsmaxplus
|
||||
version: v0.5.10
|
||||
version: v0.5.11
|
||||
|
||||
engines.tk-3dsmax.location:
|
||||
type: app_store
|
||||
name: tk-3dsmax
|
||||
version: v1.1.4
|
||||
version: v1.1.6
|
||||
|
||||
# After Effects
|
||||
engines.tk-aftereffects.location:
|
||||
type: app_store
|
||||
name: tk-aftereffects
|
||||
version: v0.2.0
|
||||
version: v0.2.1
|
||||
|
||||
# Alias
|
||||
engines.tk-alias.location:
|
||||
type: app_store
|
||||
name: tk-alias
|
||||
version: v2.0.8
|
||||
version: v2.0.11
|
||||
|
||||
# Desktop
|
||||
engines.tk-desktop.location:
|
||||
type: app_store
|
||||
name: tk-desktop
|
||||
version: v2.5.9
|
||||
version: v2.5.13
|
||||
|
||||
# Desktop2
|
||||
engines.tk-desktop2.location:
|
||||
|
|
@ -52,7 +52,7 @@ engines.tk-desktop2.location:
|
|||
engines.tk-flame.location:
|
||||
type: app_store
|
||||
name: tk-flame
|
||||
version: v1.15.6
|
||||
version: v1.16.2
|
||||
|
||||
# Houdini
|
||||
engines.tk-houdini.location:
|
||||
|
|
@ -64,31 +64,31 @@ engines.tk-houdini.location:
|
|||
engines.tk-mari.location:
|
||||
type: app_store
|
||||
name: tk-mari
|
||||
version: v1.2.3
|
||||
version: v1.2.4
|
||||
|
||||
# Maya
|
||||
engines.tk-maya.location:
|
||||
type: app_store
|
||||
name: tk-maya
|
||||
version: v0.10.1
|
||||
version: v0.10.4
|
||||
|
||||
# Motion Builder
|
||||
engines.tk-motionbuilder.location:
|
||||
type: app_store
|
||||
name: tk-motionbuilder
|
||||
version: v0.5.1
|
||||
version: v0.5.2
|
||||
|
||||
# Nuke
|
||||
engines.tk-nuke.location:
|
||||
type: app_store
|
||||
name: tk-nuke
|
||||
version: v0.12.9
|
||||
version: v0.13.0
|
||||
|
||||
# Photoshop
|
||||
engines.tk-photoshopcc.location:
|
||||
type: app_store
|
||||
name: tk-photoshopcc
|
||||
version: v1.8.1
|
||||
version: v1.8.2
|
||||
|
||||
# Shell
|
||||
engines.tk-shell.location:
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ frameworks:
|
|||
# adobe - Common functionality for adobe products
|
||||
tk-framework-adobe_v1.x.x:
|
||||
location:
|
||||
version: v1.1.0
|
||||
version: v1.1.2
|
||||
type: app_store
|
||||
name: tk-framework-adobe
|
||||
|
||||
|
|
@ -38,13 +38,13 @@ frameworks:
|
|||
# desktopserver - provides a server to run local commands.
|
||||
tk-framework-desktopserver_v1.x.x:
|
||||
location:
|
||||
version: v1.4.4
|
||||
version: v1.4.7
|
||||
type: app_store
|
||||
name: tk-framework-desktopserver
|
||||
# qtwidgets - collection of Toolkit related QT Widgets
|
||||
tk-framework-qtwidgets_v2.x.x:
|
||||
location:
|
||||
version: v2.9.3
|
||||
version: v2.9.4
|
||||
type: app_store
|
||||
name: tk-framework-qtwidgets
|
||||
|
||||
|
|
@ -58,7 +58,7 @@ frameworks:
|
|||
# shotgunutils v5 - Shotgun Related Utilities
|
||||
tk-framework-shotgunutils_v5.x.x:
|
||||
location:
|
||||
version: v5.7.8
|
||||
version: v5.7.10
|
||||
type: app_store
|
||||
name: tk-framework-shotgunutils
|
||||
# widget v0 - QT Widget Framework for Tank Apps (qtwidgets fw predecessor)
|
||||
|
|
@ -85,6 +85,6 @@ frameworks:
|
|||
# lmv - provides LMV conversion tools
|
||||
tk-framework-lmv_v0.x.x:
|
||||
location:
|
||||
version: v0.1.2
|
||||
version: v0.1.3
|
||||
type: app_store
|
||||
name: tk-framework-lmv
|
||||
|
|
|
|||
|
|
@ -341,6 +341,11 @@ settings.tk-multi-loader2.alias:
|
|||
filters:
|
||||
- [project, is, '{context.project}']
|
||||
hierarchy: [sg_asset_type, code]
|
||||
- caption: Assets - Linked
|
||||
entity_type: Asset
|
||||
filters:
|
||||
- [linked_projects, is, "{context.project}"]
|
||||
hierarchy: [project.Project.name, sg_asset_type, code]
|
||||
- caption: My Tasks
|
||||
entity_type: Task
|
||||
filters:
|
||||
|
|
@ -363,12 +368,19 @@ settings.tk-multi-loader2.vred:
|
|||
Fbx File: [import]
|
||||
VRED Scene: [import]
|
||||
Osb File: [import]
|
||||
Image: [import_sceneplate]
|
||||
Rendered Image: [import_sceneplate]
|
||||
entities:
|
||||
- caption: Assets
|
||||
entity_type: Asset
|
||||
filters:
|
||||
- [project, is, '{context.project}']
|
||||
hierarchy: [sg_asset_type, code]
|
||||
- caption: Assets - Linked
|
||||
entity_type: Asset
|
||||
filters:
|
||||
- [linked_projects, is, "{context.project}"]
|
||||
hierarchy: [project.Project.name, sg_asset_type, code]
|
||||
- caption: My Tasks
|
||||
entity_type: Task
|
||||
filters:
|
||||
|
|
|
|||
|
|
@ -304,6 +304,8 @@ settings.tk-multi-shotgunpanel.alias:
|
|||
|
||||
# VRED
|
||||
settings.tk-multi-shotgunpanel.vred:
|
||||
shotgun_fields_hook: "{self}/shotgun_fields.py:{engine}/tk-multi-shotgunpanel/basic/shotgun_fields.py"
|
||||
shotgun_filters_hook: "{engine}/tk-multi-shotgunpanel/basic/shotgun_filters.py"
|
||||
action_mappings:
|
||||
PublishedFile:
|
||||
- actions: [import]
|
||||
|
|
@ -324,13 +326,17 @@ settings.tk-multi-shotgunpanel.vred:
|
|||
filters: {published_file_type: VRED Scene}
|
||||
- actions: [import]
|
||||
filters: {published_file_type: Osb File}
|
||||
- actions: [import_sceneplate]
|
||||
filters: {published_file_type: Image}
|
||||
- actions: [import_sceneplate]
|
||||
filters: {published_file_type: Rendered Image}
|
||||
- actions: [publish_clipboard]
|
||||
filters: {}
|
||||
Task:
|
||||
- actions: [assign_task, task_to_ip]
|
||||
filters: {}
|
||||
Version:
|
||||
- actions: [quicktime_clipboard, sequence_clipboard, add_to_playlist]
|
||||
- actions: [quicktime_clipboard, sequence_clipboard, add_to_playlist, load_for_review]
|
||||
filters: {}
|
||||
actions_hook: "{engine}/tk-multi-shotgunpanel/basic/scene_actions.py"
|
||||
location: "@apps.tk-multi-shotgunpanel.location"
|
||||
|
|
|
|||
|
|
@ -17,7 +17,6 @@ includes:
|
|||
|
||||
settings.tk-shotgun-launchvredreview:
|
||||
deny_platforms: [ Mac, Linux ]
|
||||
viewer_extensions: [ vpb ]
|
||||
hook_verify_install: "{self}/verify_install.py"
|
||||
hook_launch_publish: "{self}/shotgun_launch_vred.py"
|
||||
location: "@apps.tk-shotgun-launchvredreview.location"
|
||||
|
|
|
|||
|
|
@ -46,6 +46,12 @@ settings.tk-shotgun.asset_step:
|
|||
tk-shotgun-launchfolder: "@settings.tk-shotgun-launchfolder"
|
||||
location: "@engines.tk-shotgun.location"
|
||||
|
||||
# playlist
|
||||
settings.tk-shotgun.playlist:
|
||||
apps:
|
||||
tk-shotgun-launchvredreview: "@settings.tk-shotgun-launchvredreview"
|
||||
location: "@engines.tk-shotgun.location"
|
||||
|
||||
# project
|
||||
settings.tk-shotgun.project:
|
||||
apps:
|
||||
|
|
@ -120,3 +126,11 @@ settings.tk-shotgun.shot_step:
|
|||
tk-multi-screeningroom: "@settings.tk-multi-screeningroom.rv"
|
||||
tk-shotgun-launchfolder: "@settings.tk-shotgun-launchfolder"
|
||||
location: "@engines.tk-shotgun.location"
|
||||
|
||||
# version
|
||||
settings.tk-shotgun.version:
|
||||
apps:
|
||||
tk-multi-screeningroom: "@settings.tk-multi-screeningroom.rv"
|
||||
tk-shotgun-launchpublish: "@settings.tk-shotgun-launchpublish"
|
||||
tk-shotgun-launchvredreview: "@settings.tk-shotgun-launchvredreview"
|
||||
location: "@engines.tk-shotgun.location"
|
||||
|
|
|
|||
|
|
@ -70,6 +70,15 @@ settings.tk-vred.project:
|
|||
|
||||
# version for tk-shotgun-launchvredreview
|
||||
settings.tk-vred.version:
|
||||
apps:
|
||||
tk-multi-shotgunpanel: "@settings.tk-multi-shotgunpanel.vred"
|
||||
run_at_startup:
|
||||
- {app_instance: tk-multi-shotgunpanel, name: ""}
|
||||
accepted_published_file_types: [ VRED Scene, Alias File, Catpart File, Jt File, Igs File ]
|
||||
location: "@engines.tk-vred.location"
|
||||
|
||||
# playlist for tk-shotgun-launchvredreview
|
||||
settings.tk-vred.playlist:
|
||||
apps:
|
||||
tk-multi-shotgunpanel: "@settings.tk-multi-shotgunpanel.vred"
|
||||
run_at_startup:
|
||||
|
|
|
|||
|
|
@ -0,0 +1,35 @@
|
|||
# Copyright (c) 2020 Autodesk, 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 Autodesk, Inc.
|
||||
#
|
||||
|
||||
description: Apps and engines loaded when a Playlist is loaded.
|
||||
By default, the only engine defined here is tk-shotgun and tk-vred.
|
||||
This configuration provides the apps that are necessary to display
|
||||
menu actions in the Shotgun web application by way of Toolkit's
|
||||
browser integration.
|
||||
|
||||
################################################################################
|
||||
|
||||
includes:
|
||||
- ./includes/frameworks.yml
|
||||
- ./includes/settings/tk-shotgun.yml
|
||||
- ./includes/settings/tk-vred.yml
|
||||
|
||||
################################################################################
|
||||
# configuration for all engines to load in a playlist context
|
||||
|
||||
engines:
|
||||
tk-shotgun: "@settings.tk-shotgun.playlist"
|
||||
tk-vred: "@settings.tk-vred.playlist"
|
||||
|
||||
################################################################################
|
||||
# reference all of the common frameworks
|
||||
|
||||
frameworks: "@frameworks"
|
||||
2
info.yml
2
info.yml
|
|
@ -16,4 +16,4 @@ description: "A config for Unity-based pipelines. Based on tk-config-default2."
|
|||
|
||||
# Required minimum versions for this item to run
|
||||
requires_shotgun_version: "v7.2.0"
|
||||
requires_core_version: "v0.19.5"
|
||||
requires_core_version: "v0.19.18"
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче