Skip to content

Commit 1240405

Browse files
geffrakmathurf
geffrak
and
mathurf
authored
Add tk-multi-reviewsubmission to the basic config (#82)
Co-authored-by: mathurf <[email protected]>
1 parent 917bf4e commit 1240405

26 files changed

+716
-5
lines changed

‎core/hooks/pick_environment.py‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,17 @@ def execute(self, context, **kwargs):
2424
if context.source_entity and context.source_entity["type"] == "PublishedFile":
2525
return "publishedfile"
2626

27-
if context.entity and context.entity["type"] == "Shot":
28-
return "shot"
27+
if context.entity and context.step is None:
28+
# We have an entity but no step.
29+
if context.entity["type"] == "Shot":
30+
return "shot"
31+
32+
if context.entity and context.task:
33+
# We have an entity and a task.
34+
if context.entity["type"] == "Shot":
35+
return "shot_step"
36+
if context.entity["type"] == "Asset":
37+
return "asset_step"
2938

3039
if context.project:
3140
return "project"

‎env/asset_step.yml‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# Copyright (c) 2017 Shotgun Software Inc.
2+
#
3+
# CONFIDENTIAL AND PROPRIETARY
4+
#
5+
# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit
6+
# Source Code License included in this distribution package. See LICENSE.
7+
# By accessing, using, copying or modifying this work you indicate your
8+
# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights
9+
# not expressly granted therein are reserved by Shotgun Software Inc.
10+
#
11+
12+
description: Toolkit configuration to be loaded whenever an association with a
13+
asset_step has been established.
14+
15+
includes:
16+
- includes/desktop2/all.yml
17+
- includes/houdini/asset_step.yml
18+
- includes/maya/asset_step.yml
19+
- includes/nuke/asset_step.yml
20+
- includes/flame/asset_step.yml
21+
- includes/shell/asset_step.yml
22+
- includes/photoshopcc/asset_step.yml
23+
- includes/aftereffects/asset_step.yml
24+
- includes/3dsmax/asset_step.yml
25+
- includes/shotgun/all.yml
26+
27+
engines:
28+
tk-desktop2: '@desktop2.all'
29+
tk-houdini: '@houdini.asset_step'
30+
tk-maya: '@maya.asset_step'
31+
tk-nuke: '@nuke.asset_step'
32+
tk-nukestudio: '@nukestudio.asset_step'
33+
tk-flame: '@flame.asset_step'
34+
tk-shell: '@shell.asset_step'
35+
tk-photoshopcc: '@photoshopcc.asset_step'
36+
tk-aftereffects: '@aftereffects.asset_step'
37+
tk-3dsmaxplus: '@3dsmax.asset_step'
38+
tk-shotgun: '@shotgun.all'

‎env/includes/3dsmax/asset_step.yml‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
# Copyright (c) 2017 Shotgun Software Inc.
2+
#
3+
# CONFIDENTIAL AND PROPRIETARY
4+
#
5+
# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit
6+
# Source Code License included in this distribution package. See LICENSE.
7+
# By accessing, using, copying or modifying this work you indicate your
8+
# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights
9+
# not expressly granted therein are reserved by Shotgun Software Inc.
10+
#
11+
12+
# this configuration defines the behavior of the 3dsMax Integration when it
13+
# is running in its asset_step level configuration
14+
15+
includes:
16+
- ../common/engines.yml
17+
- ../common/apps.yml
18+
- apps.yml
19+
20+
3dsmax.asset_step:
21+
apps:
22+
tk-multi-about: '@common.apps.tk-multi-about'
23+
24+
tk-multi-pythonconsole: '@common.apps.tk-multi-pythonconsole'
25+
26+
tk-multi-publish2: '@3dsmax.apps.tk-multi-publish2'
27+
28+
tk-multi-loader2: '@3dsmax.apps.tk-multi-loader2'
29+
30+
tk-multi-shotgunpanel: '@3dsmax.apps.tk-multi-shotgunpanel'
31+
32+
location: "@common.engines.tk-3dsmaxplus.location"
33+
menu_favourites: []
34+
launch_builtin_plugins: [basic]
35+
36+

‎env/includes/3dsmax/shot_step.yml‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# Copyright (c) 2017 Shotgun Software Inc.
2+
#
3+
# CONFIDENTIAL AND PROPRIETARY
4+
#
5+
# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit
6+
# Source Code License included in this distribution package. See LICENSE.
7+
# By accessing, using, copying or modifying this work you indicate your
8+
# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights
9+
# not expressly granted therein are reserved by Shotgun Software Inc.
10+
#
11+
12+
# this configuration defines the behavior of the 3dsMax Integration when it
13+
# is running in its shot_step level configuration
14+
15+
includes:
16+
- ../common/engines.yml
17+
- ../common/apps.yml
18+
- apps.yml
19+
20+
3dsmax.shot_step:
21+
apps:
22+
tk-multi-about: '@common.apps.tk-multi-about'
23+
24+
tk-multi-pythonconsole: '@common.apps.tk-multi-pythonconsole'
25+
26+
tk-multi-setframerange: '@common.apps.tk-multi-setframerange'
27+
28+
tk-multi-publish2: '@3dsmax.apps.tk-multi-publish2'
29+
30+
tk-multi-loader2: '@3dsmax.apps.tk-multi-loader2'
31+
32+
tk-multi-shotgunpanel: '@3dsmax.apps.tk-multi-shotgunpanel'
33+
34+
location: "@common.engines.tk-3dsmaxplus.location"
35+
menu_favourites: []
36+
launch_builtin_plugins: [basic]
37+
38+

‎env/includes/aftereffects/asset_step.yml‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# Copyright (c) 2017 Shotgun Software Inc.
2+
#
3+
# CONFIDENTIAL AND PROPRIETARY
4+
#
5+
# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit
6+
# Source Code License included in this distribution package. See LICENSE.
7+
# By accessing, using, copying or modifying this work you indicate your
8+
# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights
9+
# not expressly granted therein are reserved by Shotgun Software Inc.
10+
#
11+
12+
# this configuration defines the behavior of the After Effects Integration when it
13+
# is running in its asset_step level configuration
14+
15+
includes:
16+
- ../common/engines.yml
17+
- ../common/apps.yml
18+
- apps.yml
19+
20+
21+
aftereffects.asset_step:
22+
apps:
23+
tk-multi-about: "@common.apps.tk-multi-about"
24+
25+
tk-multi-pythonconsole: "@common.apps.tk-multi-pythonconsole"
26+
27+
tk-multi-publish2: "@aftereffects.apps.tk-multi-publish2"
28+
29+
tk-multi-loader2: "@aftereffects.apps.tk-multi-loader2"
30+
31+
tk-multi-shotgunpanel: "@aftereffects.apps.tk-multi-shotgunpanel"
32+
33+
shelf_favorites: []
34+
debug_logging: true
35+
location: "@common.engines.tk-aftereffects.location"
36+
automatic_context_switch: false
37+

‎env/includes/aftereffects/shot_step.yml‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# Copyright (c) 2017 Shotgun Software Inc.
2+
#
3+
# CONFIDENTIAL AND PROPRIETARY
4+
#
5+
# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit
6+
# Source Code License included in this distribution package. See LICENSE.
7+
# By accessing, using, copying or modifying this work you indicate your
8+
# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights
9+
# not expressly granted therein are reserved by Shotgun Software Inc.
10+
#
11+
12+
# this configuration defines the behavior of the After Effects Integration when it
13+
# is running in its shot_step level configuration
14+
15+
includes:
16+
- ../common/engines.yml
17+
- ../common/apps.yml
18+
- apps.yml
19+
20+
21+
aftereffects.shot_step:
22+
apps:
23+
tk-multi-about: "@common.apps.tk-multi-about"
24+
25+
tk-multi-pythonconsole: "@common.apps.tk-multi-pythonconsole"
26+
27+
tk-multi-publish2: "@aftereffects.apps.tk-multi-publish2"
28+
29+
tk-multi-loader2: "@aftereffects.apps.tk-multi-loader2"
30+
31+
tk-multi-shotgunpanel: "@aftereffects.apps.tk-multi-shotgunpanel"
32+
33+
shelf_favorites: []
34+
debug_logging: true
35+
location: "@common.engines.tk-aftereffects.location"
36+
automatic_context_switch: false
37+

‎env/includes/common/apps.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,11 @@ common.apps.tk-multi-launchapp.location:
5757
name: tk-multi-launchapp
5858
version: v0.11.0
5959

60+
common.apps.tk-multi-reviewsubmission.location:
61+
type: app_store
62+
name: tk-multi-reviewsubmission
63+
version: v1.0.0
64+
6065
common.apps.tk-nuke-quickreview.location:
6166
type: app_store
6267
name: tk-nuke-quickreview

‎env/includes/common/frameworks.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,3 +47,9 @@ frameworks:
4747
version: v1.3.9
4848
type: app_store
4949
name: tk-framework-desktopserver
50+
tk-framework-desktopclient_v0.x.x:
51+
location:
52+
version: v0.0.9
53+
type: app_store
54+
name: tk-framework-desktopclient
55+

‎env/includes/flame/asset_step.yml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# Copyright (c) 2016 Shotgun Software Inc.
2+
#
3+
# CONFIDENTIAL AND PROPRIETARY
4+
#
5+
# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit
6+
# Source Code License included in this distribution package. See LICENSE.
7+
# By accessing, using, copying or modifying this work you indicate your
8+
# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights
9+
# not expressly granted therein are reserved by Shotgun Software Inc.
10+
#
11+
12+
# this configuration defines the behavior of the Flame Integration when it
13+
# is running in its asset_step level configuration
14+
15+
includes:
16+
- ../common/engines.yml
17+
18+
19+
# the flame integration is built into flame
20+
# we only include the engine here so that we can launch flame
21+
# from shotgun desktop and shotgun.
22+
flame.asset_step:
23+
apps:
24+
location: "@common.engines.tk-flame.location"
25+
use_builtin_plugin: true
26+

‎env/includes/flame/shot.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#
1111

1212
# this configuration defines the behavior of the Flame Integration when it
13-
# is running in its project level configuration
13+
# is running in its shot level configuration
1414

1515
includes:
1616
- ../common/engines.yml

0 commit comments

Comments
 (0)